From 6c8413fce16569e3883b48e64cd5da2a37a209d6 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Thu, 10 Oct 2013 09:57:28 +0200 Subject: [PATCH] Fix doc-string of pop-to-buffer-same-window. (Bug#15492) * window.el (pop-to-buffer-same-window): Fix doc-string. (Bug#15492) --- lisp/ChangeLog | 5 +++++ lisp/window.el | 14 +++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cea0f7c4a59..d219bade1d9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-10-10 Martin Rudalics + + * window.el (pop-to-buffer-same-window): Fix doc-string. + (Bug#15492) + 2013-10-10 Stefan Monnier * menu-bar.el (tty-menu-navigation-map): Reduce redundancy. diff --git a/lisp/window.el b/lisp/window.el index e4959da3d21..3f409a6f26a 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -5861,20 +5861,16 @@ at the front of the list of recently selected ones." (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'. - -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." +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." (pop-to-buffer buffer display-buffer--same-window-action norecord)) (defun read-buffer-to-switch (prompt) -- 2.39.2