aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2011-10-10 08:31:07 +0200
committerMartin Rudalics2011-10-10 08:31:07 +0200
commit0563dae9a9e3a8c2b6de454693c0cc207e67f05d (patch)
tree4d839f8277827e662a98e55c23f19139e3c26138
parent3dc62b2b1e2f1c44d867907683702dd10763a0c5 (diff)
downloademacs-0563dae9a9e3a8c2b6de454693c0cc207e67f05d.tar.gz
emacs-0563dae9a9e3a8c2b6de454693c0cc207e67f05d.zip
Fix doc-strings of special-display-... variables.
* window.el (special-display-buffer-names) (special-display-regexps): Remove some remnants of earlier changes from doc-strings.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/window.el18
2 files changed, 14 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1eaf61ad3c2..103d7b25518 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12011-10-10 Martin Rudalics <rudalics@gmx.at>
2
3 * window.el (special-display-buffer-names)
4 (special-display-regexps): Remove some remnants of earlier
5 changes from doc-strings.
6
12011-10-09 Martin Rudalics <rudalics@gmx.at> 72011-10-09 Martin Rudalics <rudalics@gmx.at>
2 8
3 * window.el (frame-auto-hide-function): Add version tag. 9 * window.el (frame-auto-hide-function): Add version tag.
diff --git a/lisp/window.el b/lisp/window.el
index 4a421852f82..7241e148dae 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -3959,12 +3959,10 @@ Finally, an element of this list can be also specified as
3959\(BUFFER-NAME FUNCTION OTHER-ARGS). In that case, 3959\(BUFFER-NAME FUNCTION OTHER-ARGS). In that case,
3960`special-display-popup-frame' will call FUNCTION with the buffer 3960`special-display-popup-frame' will call FUNCTION with the buffer
3961named BUFFER-NAME as first argument, and OTHER-ARGS as the 3961named BUFFER-NAME as first argument, and OTHER-ARGS as the
3962second. If `special-display-function' specifies some other 3962second.
3963function, that function is called with the buffer named 3963
3964BUFFER-NAME as first, and the element's cdr as second argument. 3964Any alternative function specified here is responsible for
3965In any case, that function is responsible for setting the value 3965setting up the quit-restore parameter of the window used.
3966The function specified here is responsible for setting the
3967quit-restore and help-setup parameters of the window used.
3968 3966
3969If this variable appears \"not to work\", because you added a 3967If this variable appears \"not to work\", because you added a
3970name to it but the corresponding buffer is displayed in the 3968name to it but the corresponding buffer is displayed in the
@@ -4029,10 +4027,10 @@ as second argument.
4029Finally, an element of this list can be also specified as 4027Finally, an element of this list can be also specified as
4030\(REGEXP FUNCTION OTHER-ARGS). `special-display-popup-frame' 4028\(REGEXP FUNCTION OTHER-ARGS). `special-display-popup-frame'
4031will then call FUNCTION with the buffer whose name matched 4029will then call FUNCTION with the buffer whose name matched
4032REGEXP as first, and OTHER-ARGS as second argument. If 4030REGEXP as first, and OTHER-ARGS as second argument.
4033`special-display-function' specifies some other function, that 4031
4034function is called with the buffer whose name matched REGEXP 4032Any alternative function specified here is responsible for
4035as first, and the element's cdr as second argument. 4033setting up the quit-restore parameter of the window used.
4036 4034
4037If this variable appears \"not to work\", because you added a 4035If this variable appears \"not to work\", because you added a
4038name to it but the corresponding buffer is displayed in the 4036name to it but the corresponding buffer is displayed in the