diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2011-06-16 10:55:08 +0200 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2011-06-16 10:55:08 +0200 |
| commit | 981d5c0932ed7a9cf66e48fb5d220151722a31c0 (patch) | |
| tree | 60782ca1269996e6bf2d78b3a8cbc5fff4e3c305 /lisp | |
| parent | 9b9c9e3acbd2285e87e0233d4cfc83c65f2235d1 (diff) | |
| download | emacs-981d5c0932ed7a9cf66e48fb5d220151722a31c0.tar.gz emacs-981d5c0932ed7a9cf66e48fb5d220151722a31c0.tar.bz2 emacs-981d5c0932ed7a9cf66e48fb5d220151722a31c0.zip | |
Fix doc-strings of switch-to-buffer family functions (bug#8875).
(switch-to-buffer-same-frame, switch-to-buffer-other-window)
(switch-to-buffer-other-window-same-frame)
(switch-to-buffer-other-frame): Fix doc-strings. Reported by Drew
Adams (Bug#8875).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/window.el | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b4b726c7407..92939d77fe4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,6 +3,10 @@ * window.el (display-buffer-normalize-specifiers-1): Respect current value of pop-up-frames for most reasonable values of second argument of display-buffer (Bug#8865). + (switch-to-buffer-same-frame, switch-to-buffer-other-window) + (switch-to-buffer-other-window-same-frame) + (switch-to-buffer-other-frame): Fix doc-strings. Reported by Drew + Adams (Bug#8875). 2011-06-15 Stefan Monnier <monnier@iro.umontreal.ca> diff --git a/lisp/window.el b/lisp/window.el index 1661fedfe25..71723818794 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -5511,8 +5511,8 @@ functions should call `pop-to-buffer-same-window' instead." (defun switch-to-buffer-same-frame (buffer-or-name &optional norecord) "Switch to buffer BUFFER-OR-NAME in a window on the selected frame. Another frame will be used only if there is no other choice. -Optional arguments BUFFER-OR-NAME and NORECORD have the same -meaning as for `switch-to-buffer'. +Arguments BUFFER-OR-NAME and NORECORD have the same meaning as +for `switch-to-buffer'. This function is intended for interactive use only. Lisp functions should call `pop-to-buffer-same-frame' instead." @@ -5525,8 +5525,8 @@ functions should call `pop-to-buffer-same-frame' instead." "Switch to buffer BUFFER-OR-NAME in another window. The selected window will be used only if there is no other choice. Windows on the selected frame are preferred to windows -on other frames. Optional arguments BUFFER-OR-NAME and NORECORD -have the same meaning as for `switch-to-buffer'. +on other frames. Arguments BUFFER-OR-NAME and NORECORD have the +same meaning as for `switch-to-buffer'. This function is intended for interactive use only. Lisp functions should call `pop-to-buffer-other-window' instead." @@ -5538,8 +5538,8 @@ functions should call `pop-to-buffer-other-window' instead." (defun switch-to-buffer-other-window-same-frame (buffer-or-name &optional norecord) "Switch to buffer BUFFER-OR-NAME in another window on the selected frame. The selected window or another frame will be used only if there -is no other choice. Optional arguments BUFFER-OR-NAME and -NORECORD have the same meaning as for `switch-to-buffer'. +is no other choice. Arguments BUFFER-OR-NAME and NORECORD have +the same meaning as for `switch-to-buffer'. This function is intended for interactive use only. Lisp functions should call `pop-to-buffer-other-window-same-frame' @@ -5552,8 +5552,8 @@ instead." (defun switch-to-buffer-other-frame (buffer-or-name &optional norecord) "Switch to buffer BUFFER-OR-NAME on another frame. The same frame will be used only if there is no other choice. -Optional arguments BUFFER-OR-NAME and NORECORD have the same -meaning as for `switch-to-buffer'. +Arguments BUFFER-OR-NAME and NORECORD have the same meaning +as for `switch-to-buffer'. This function is intended for interactive use only. Lisp functions should call `pop-to-buffer-other-frame' instead." |