diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/frameset.el | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ae54e4d526e..15e0ad745b1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2013-08-04 Juanma Barranquero <lekktu@gmail.com> + * frameset.el (frameset-p, frameset-save): Fix autoload cookies. + (frameset-filter-minibuffer): Doc fix. + (frameset-restore): Fix autoload cookie. Fix typo in docstring. + * desktop.el (desktop-clear): Only delete frames when called interactively and desktop-restore-frames is non-nil. Doc fix. (desktop-read): Set desktop-saved-frameset to nil. diff --git a/lisp/frameset.el b/lisp/frameset.el index 914ef5306cb..63ee9af23fc 100644 --- a/lisp/frameset.el +++ b/lisp/frameset.el @@ -71,7 +71,7 @@ This is a deep copy done with `copy-tree'." (copy-tree frameset t)) -;;;autoload +;;;###autoload (defun frameset-p (frameset) "If FRAMESET is a frameset, return its :version. Else return nil." @@ -179,7 +179,7 @@ Useful as a filter function for tty-specific parameters." (not (string-match-p "^unspecified-[fb]g$" (cdr current))))) (defun frameset-filter-minibuffer (current _filtered _parameters saving) - "Convert (minibuffer . #<window>) parameter to (minibuffer . t)." + "When saving, convert (minibuffer . #<window>) parameter to (minibuffer . t)." (or (not saving) (if (windowp (cdr current)) '(minibuffer . t) @@ -302,7 +302,7 @@ FRAME-LIST is a list of frames." 'frameset--mini (cons nil id))))))) -;;;autoload +;;;###autoload (cl-defun frameset-save (frame-list &key filters predicate properties) "Return the frameset of FRAME-LIST, a list of frames. If nil, FRAME-LIST defaults to all live frames. @@ -547,11 +547,11 @@ Minibufferless frames must go first to avoid errors when attempting to delete a frame whose minibuffer window is used by another frame." (not (frame-parameter frame1 'minibuffer))) -;;;autoload +;;;###autoload (cl-defun frameset-restore (frameset &key filters reuse-frames force-display force-onscreen) "Restore a FRAMESET into the current display(s). -FILTERS is a list of parameter filters; defaults to `frameset-filter-alist'. +FILTERS is an alist of parameter filters; defaults to `frameset-filter-alist'. REUSE-FRAMES describes how to reuse existing frames while restoring a frameset: t Reuse any existing frame if possible; delete leftover frames. |