aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2013-08-08 12:44:07 +0200
committerJuanma Barranquero2013-08-08 12:44:07 +0200
commitf9dbf1cbb89b503e1d02cd5ba9052c05c0fb81ac (patch)
tree69cf1aac0b16fdf17c6dcd65cf3df0980f56aa36
parent76c5e5ab36d7f05f34c1bcca4b3ec6d1fcbfce86 (diff)
downloademacs-f9dbf1cbb89b503e1d02cd5ba9052c05c0fb81ac.tar.gz
emacs-f9dbf1cbb89b503e1d02cd5ba9052c05c0fb81ac.zip
lisp/frameset.el: Doc fixes.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/frameset.el13
2 files changed, 13 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b7964fa4517..6f5469f4d55 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -8,6 +8,8 @@
8 (frameset-p, frameset-version, frameset-timestamp, frameset-app) 8 (frameset-p, frameset-version, frameset-timestamp, frameset-app)
9 (frameset-name, frameset-description, frameset-properties) 9 (frameset-name, frameset-description, frameset-properties)
10 (frameset-states): Add docstring. 10 (frameset-states): Add docstring.
11 (frameset-session-filter-alist, frameset-persistent-filter-alist)
12 (frameset-filter-alist): Doc fixes.
11 13
122013-08-08 Juanma Barranquero <lekktu@gmail.com> 142013-08-08 Juanma Barranquero <lekktu@gmail.com>
13 15
diff --git a/lisp/frameset.el b/lisp/frameset.el
index 52d01c70d64..c3fdfa52886 100644
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -432,7 +432,7 @@ Properties can be set with
432 (minibuffer . frameset-filter-minibuffer) 432 (minibuffer . frameset-filter-minibuffer)
433 (top . frameset-filter-iconified)) 433 (top . frameset-filter-iconified))
434 "Minimum set of parameters to filter for live (on-session) framesets. 434 "Minimum set of parameters to filter for live (on-session) framesets.
435See `frameset-filter-alist' for a full description.") 435DO NOT MODIFY. See `frameset-filter-alist' for a full description.")
436 436
437;;;###autoload 437;;;###autoload
438(defvar frameset-persistent-filter-alist 438(defvar frameset-persistent-filter-alist
@@ -458,7 +458,7 @@ See `frameset-filter-alist' for a full description.")
458 (window-system . :never)) 458 (window-system . :never))
459 frameset-session-filter-alist) 459 frameset-session-filter-alist)
460 "Parameters to filter for persistent framesets. 460 "Parameters to filter for persistent framesets.
461See `frameset-filter-alist' for a full description.") 461DO NOT MODIFY. See `frameset-filter-alist' for a full description.")
462 462
463;;;###autoload 463;;;###autoload
464(defvar frameset-filter-alist frameset-persistent-filter-alist 464(defvar frameset-filter-alist frameset-persistent-filter-alist
@@ -467,6 +467,15 @@ See `frameset-filter-alist' for a full description.")
467This alist is the default value of the FILTERS argument of 467This alist is the default value of the FILTERS argument of
468`frameset-save' and `frameset-restore' (which see). 468`frameset-save' and `frameset-restore' (which see).
469 469
470Initially, `frameset-filter-alist' is set to, and shares the value of,
471`frameset-persistent-filter-alist'. You can override any item in
472this alist by `push'ing a new item onto it. If, for some reason, you
473intend to modify existing values, do
474
475 (setq frameset-filter-alist (copy-tree frameset-filter-alist))
476
477before changing anything.
478
470On saving, PARAMETERS is the parameter alist of each frame processed, 479On saving, PARAMETERS is the parameter alist of each frame processed,
471and FILTERED is the parameter alist that gets saved to the frameset. 480and FILTERED is the parameter alist that gets saved to the frameset.
472 481