From dcb50c02f5acb65e5b180c10709d634235d9cfbe Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Fri, 9 Jan 2009 09:55:38 +0000 Subject: [PATCH] (special-display-buffer-names) (special-display-regexps, special-display-function): In doc-strings say "same-window" instead of "same-buffer". --- lisp/ChangeLog | 6 ++++++ lisp/window.el | 16 ++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e9aaac24c35..248a55c04a2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2009-01-09 Martin Rudalics + + * window.el (special-display-buffer-names) + (special-display-regexps, special-display-function): In + doc-strings say "same-window" instead of "same-buffer". + 2009-01-09 Michael Albinus * net/tramp.el: Revert previous patch. `last-command-char' is diff --git a/lisp/window.el b/lisp/window.el index c529e272ce2..fc76ea96d6e 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -590,10 +590,10 @@ the first argument, followed by the OTHER-ARGS--it can display BUFFER in any way it likes. All this is done by the function found in `special-display-function'. -If the specified frame parameters include (same-buffer . t), the -buffer is displayed in the currently selected window. Otherwise, if -they include (same-frame . t), the buffer is displayed in a new window -in the currently selected frame. +If the specified frame parameters include (same-window . t), the +buffer is displayed in the currently selected window. Otherwise, +if they include (same-frame . t), the buffer is displayed in a +new window in the currently selected frame. If this variable appears \"not to work\", because you add a name to it but that buffer still appears in the selected window, look at the @@ -629,7 +629,7 @@ the first argument, followed by the OTHER-ARGS--it can display the buffer in any way it likes. All this is done by the function found in `special-display-function'. -If the specified frame parameters include (same-buffer . t), the +If the specified frame parameters include (same-window . t), the buffer is displayed in the currently selected window. Otherwise, if they include (same-frame . t), the buffer is displayed in a new window in the currently selected frame. @@ -660,9 +660,9 @@ The default value normally makes a separate frame for the buffer, using `special-display-frame-alist' to specify the frame parameters. -But if the buffer specific data includes (same-buffer . t) then -the buffer is displayed in the current selected window. -Otherwise if it includes (same-frame . t) then the buffer is +But if the buffer specific data includes (same-window . t) then +the buffer is displayed in the currently selected window. +Otherwise, if it includes (same-frame . t) then the buffer is displayed in a new window in the currently selected frame. A buffer is special if it is listed in -- 2.11.4.GIT