[Emacs-diffs] emacs/lisp ChangeLog window.el

[Martin Rudalics]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Martin Rudalics <m061211>       09/01/09 09:55:39

Modified files:
        lisp           : ChangeLog window.el 

Log message:
        (special-display-buffer-names)
        (special-display-regexps, special-display-function): In
        doc-strings say "same-window" instead of "same-buffer".

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15076&r2=1.15077
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/window.el?cvsroot=emacs&r1=1.175&r2=1.176

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15076
retrieving revision 1.15077
diff -u -b -r1.15076 -r1.15077
--- ChangeLog   9 Jan 2009 08:15:27 -0000       1.15076
+++ ChangeLog   9 Jan 2009 09:55:38 -0000       1.15077
@@ -1,3 +1,9 @@
+2009-01-09  Martin Rudalics  <address@hidden>
+
+       * 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  <address@hidden>
 
        * net/tramp.el: Revert previous patch.  `last-command-char' is

Index: window.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/window.el,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -b -r1.175 -r1.176
--- window.el   5 Jan 2009 09:52:56 -0000       1.175
+++ window.el   9 Jan 2009 09:55:39 -0000       1.176
@@ -590,10 +590,10 @@
 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 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 @@
 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