diff options
| author | Martin Rudalics | 2013-10-10 09:57:28 +0200 |
|---|---|---|
| committer | Martin Rudalics | 2013-10-10 09:57:28 +0200 |
| commit | 6c8413fce16569e3883b48e64cd5da2a37a209d6 (patch) | |
| tree | 22ca8335143a15eb4d332d06ef568ca645028f08 | |
| parent | 1afcba638a6ecf9fe6db1e52594024b323d4145e (diff) | |
| download | emacs-6c8413fce16569e3883b48e64cd5da2a37a209d6.tar.gz emacs-6c8413fce16569e3883b48e64cd5da2a37a209d6.zip | |
Fix doc-string of pop-to-buffer-same-window. (Bug#15492)
* window.el (pop-to-buffer-same-window): Fix doc-string.
(Bug#15492)
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2013-10-10 Martin Rudalics <rudalics@gmx.at> | ||
| 2 | |||
| 3 | * window.el (pop-to-buffer-same-window): Fix doc-string. | ||
| 4 | (Bug#15492) | ||
| 5 | |||
| 1 | 2013-10-10 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2013-10-10 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * menu-bar.el (tty-menu-navigation-map): Reduce redundancy. | 8 | * 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." | |||
| 5861 | 5861 | ||
| 5862 | (defun pop-to-buffer-same-window (buffer &optional norecord) | 5862 | (defun pop-to-buffer-same-window (buffer &optional norecord) |
| 5863 | "Select buffer BUFFER in some window, preferably the same one. | 5863 | "Select buffer BUFFER in some window, preferably the same one. |
| 5864 | This function behaves much like `switch-to-buffer', except it | ||
| 5865 | displays with `special-display-function' if BUFFER has a match in | ||
| 5866 | `special-display-buffer-names' or `special-display-regexps'. | ||
| 5867 | |||
| 5868 | Unlike `pop-to-buffer', this function prefers using the selected | ||
| 5869 | window over popping up a new window or frame. | ||
| 5870 | |||
| 5871 | BUFFER may be a buffer, a string (a buffer name), or nil. If it | 5864 | BUFFER may be a buffer, a string (a buffer name), or nil. If it |
| 5872 | is a string not naming an existent buffer, create a buffer with | 5865 | is a string not naming an existent buffer, create a buffer with |
| 5873 | that name. If BUFFER is nil, choose some other buffer. Return | 5866 | that name. If BUFFER is nil, choose some other buffer. Return |
| 5874 | the buffer. | 5867 | the buffer. |
| 5875 | 5868 | ||
| 5876 | NORECORD, if non-nil means do not put this buffer at the front of | 5869 | Optional argument NORECORD, if non-nil means do not put this |
| 5877 | the list of recently selected ones." | 5870 | buffer at the front of the list of recently selected ones. |
| 5871 | |||
| 5872 | Unlike `pop-to-buffer', this function prefers using the selected | ||
| 5873 | window over popping up a new window or frame." | ||
| 5878 | (pop-to-buffer buffer display-buffer--same-window-action norecord)) | 5874 | (pop-to-buffer buffer display-buffer--same-window-action norecord)) |
| 5879 | 5875 | ||
| 5880 | (defun read-buffer-to-switch (prompt) | 5876 | (defun read-buffer-to-switch (prompt) |