diff options
| author | Martin Rudalics | 2011-06-16 10:55:08 +0200 |
|---|---|---|
| committer | Martin Rudalics | 2011-06-16 10:55:08 +0200 |
| commit | 981d5c0932ed7a9cf66e48fb5d220151722a31c0 (patch) | |
| tree | 60782ca1269996e6bf2d78b3a8cbc5fff4e3c305 | |
| parent | 9b9c9e3acbd2285e87e0233d4cfc83c65f2235d1 (diff) | |
| download | emacs-981d5c0932ed7a9cf66e48fb5d220151722a31c0.tar.gz 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).
| -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 @@ | |||
| 3 | * window.el (display-buffer-normalize-specifiers-1): Respect | 3 | * window.el (display-buffer-normalize-specifiers-1): Respect |
| 4 | current value of pop-up-frames for most reasonable values of | 4 | current value of pop-up-frames for most reasonable values of |
| 5 | second argument of display-buffer (Bug#8865). | 5 | second argument of display-buffer (Bug#8865). |
| 6 | (switch-to-buffer-same-frame, switch-to-buffer-other-window) | ||
| 7 | (switch-to-buffer-other-window-same-frame) | ||
| 8 | (switch-to-buffer-other-frame): Fix doc-strings. Reported by Drew | ||
| 9 | Adams (Bug#8875). | ||
| 6 | 10 | ||
| 7 | 2011-06-15 Stefan Monnier <monnier@iro.umontreal.ca> | 11 | 2011-06-15 Stefan Monnier <monnier@iro.umontreal.ca> |
| 8 | 12 | ||
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." | |||
| 5511 | (defun switch-to-buffer-same-frame (buffer-or-name &optional norecord) | 5511 | (defun switch-to-buffer-same-frame (buffer-or-name &optional norecord) |
| 5512 | "Switch to buffer BUFFER-OR-NAME in a window on the selected frame. | 5512 | "Switch to buffer BUFFER-OR-NAME in a window on the selected frame. |
| 5513 | Another frame will be used only if there is no other choice. | 5513 | Another frame will be used only if there is no other choice. |
| 5514 | Optional arguments BUFFER-OR-NAME and NORECORD have the same | 5514 | Arguments BUFFER-OR-NAME and NORECORD have the same meaning as |
| 5515 | meaning as for `switch-to-buffer'. | 5515 | for `switch-to-buffer'. |
| 5516 | 5516 | ||
| 5517 | This function is intended for interactive use only. Lisp | 5517 | This function is intended for interactive use only. Lisp |
| 5518 | functions should call `pop-to-buffer-same-frame' instead." | 5518 | functions should call `pop-to-buffer-same-frame' instead." |
| @@ -5525,8 +5525,8 @@ functions should call `pop-to-buffer-same-frame' instead." | |||
| 5525 | "Switch to buffer BUFFER-OR-NAME in another window. | 5525 | "Switch to buffer BUFFER-OR-NAME in another window. |
| 5526 | The selected window will be used only if there is no other | 5526 | The selected window will be used only if there is no other |
| 5527 | choice. Windows on the selected frame are preferred to windows | 5527 | choice. Windows on the selected frame are preferred to windows |
| 5528 | on other frames. Optional arguments BUFFER-OR-NAME and NORECORD | 5528 | on other frames. Arguments BUFFER-OR-NAME and NORECORD have the |
| 5529 | have the same meaning as for `switch-to-buffer'. | 5529 | same meaning as for `switch-to-buffer'. |
| 5530 | 5530 | ||
| 5531 | This function is intended for interactive use only. Lisp | 5531 | This function is intended for interactive use only. Lisp |
| 5532 | functions should call `pop-to-buffer-other-window' instead." | 5532 | functions should call `pop-to-buffer-other-window' instead." |
| @@ -5538,8 +5538,8 @@ functions should call `pop-to-buffer-other-window' instead." | |||
| 5538 | (defun switch-to-buffer-other-window-same-frame (buffer-or-name &optional norecord) | 5538 | (defun switch-to-buffer-other-window-same-frame (buffer-or-name &optional norecord) |
| 5539 | "Switch to buffer BUFFER-OR-NAME in another window on the selected frame. | 5539 | "Switch to buffer BUFFER-OR-NAME in another window on the selected frame. |
| 5540 | The selected window or another frame will be used only if there | 5540 | The selected window or another frame will be used only if there |
| 5541 | is no other choice. Optional arguments BUFFER-OR-NAME and | 5541 | is no other choice. Arguments BUFFER-OR-NAME and NORECORD have |
| 5542 | NORECORD have the same meaning as for `switch-to-buffer'. | 5542 | the same meaning as for `switch-to-buffer'. |
| 5543 | 5543 | ||
| 5544 | This function is intended for interactive use only. Lisp | 5544 | This function is intended for interactive use only. Lisp |
| 5545 | functions should call `pop-to-buffer-other-window-same-frame' | 5545 | functions should call `pop-to-buffer-other-window-same-frame' |
| @@ -5552,8 +5552,8 @@ instead." | |||
| 5552 | (defun switch-to-buffer-other-frame (buffer-or-name &optional norecord) | 5552 | (defun switch-to-buffer-other-frame (buffer-or-name &optional norecord) |
| 5553 | "Switch to buffer BUFFER-OR-NAME on another frame. | 5553 | "Switch to buffer BUFFER-OR-NAME on another frame. |
| 5554 | The same frame will be used only if there is no other choice. | 5554 | The same frame will be used only if there is no other choice. |
| 5555 | Optional arguments BUFFER-OR-NAME and NORECORD have the same | 5555 | Arguments BUFFER-OR-NAME and NORECORD have the same meaning |
| 5556 | meaning as for `switch-to-buffer'. | 5556 | as for `switch-to-buffer'. |
| 5557 | 5557 | ||
| 5558 | This function is intended for interactive use only. Lisp | 5558 | This function is intended for interactive use only. Lisp |
| 5559 | functions should call `pop-to-buffer-other-frame' instead." | 5559 | functions should call `pop-to-buffer-other-frame' instead." |