[Emacs-diffs] trunk r114608: Fix doc-string of pop-to-buffer-same-window. (Bug#15492)

[Martin Rudalics]

------------------------------------------------------------
revno: 114608
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Thu 2013-10-10 09:57:28 +0200
message:
  Fix doc-string of pop-to-buffer-same-window.  (Bug#15492)
  
  * window.el (pop-to-buffer-same-window): Fix doc-string.
  (Bug#15492)
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/window.el                 window.el-20091113204419-o5vbwnq5f7feedwu-94

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-10-10 02:33:35 +0000
+++ b/lisp/ChangeLog    2013-10-10 07:57:28 +0000
@@ -1,3 +1,8 @@
+2013-10-10  Martin Rudalics  <address@hidden>
+
+       * window.el (pop-to-buffer-same-window): Fix doc-string.
+       (Bug#15492)
+
 2013-10-10  Stefan Monnier  <address@hidden>
 
        * menu-bar.el (tty-menu-navigation-map): Reduce redundancy.

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2013-09-18 02:50:04 +0000
+++ b/lisp/window.el    2013-10-10 07:57:28 +0000
@@ -5861,20 +5861,16 @@
 
 (defun pop-to-buffer-same-window (buffer &optional norecord)
   "Select buffer BUFFER in some window, preferably the same one.
-This function behaves much like `switch-to-buffer', except it
-displays with `special-display-function' if BUFFER has a match in
-`special-display-buffer-names' or `special-display-regexps'.
+BUFFER may be a buffer, a string (a buffer name), or nil.  If it
+is a string not naming an existent buffer, create a buffer with
+that name.  If BUFFER is nil, choose some other buffer.  Return
+the buffer.
+
+Optional argument NORECORD, if non-nil means do not put this
+buffer at the front of the list of recently selected ones.
 
 Unlike `pop-to-buffer', this function prefers using the selected
-window over popping up a new window or frame.
-
-BUFFER may be a buffer, a string (a buffer name), or nil.  If it
-is a string not naming an existent buffer, create a buffer with
-that name.  If BUFFER is nil, choose some other buffer.  Return
-the buffer.
-
-NORECORD, if non-nil means do not put this buffer at the front of
-the list of recently selected ones."
+window over popping up a new window or frame."
   (pop-to-buffer buffer display-buffer--same-window-action norecord))
 
 (defun read-buffer-to-switch (prompt)