aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2011-06-16 10:55:08 +0200
committerMartin Rudalics2011-06-16 10:55:08 +0200
commit981d5c0932ed7a9cf66e48fb5d220151722a31c0 (patch)
tree60782ca1269996e6bf2d78b3a8cbc5fff4e3c305
parent9b9c9e3acbd2285e87e0233d4cfc83c65f2235d1 (diff)
downloademacs-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/ChangeLog4
-rw-r--r--lisp/window.el16
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
72011-06-15 Stefan Monnier <monnier@iro.umontreal.ca> 112011-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.
5513Another frame will be used only if there is no other choice. 5513Another frame will be used only if there is no other choice.
5514Optional arguments BUFFER-OR-NAME and NORECORD have the same 5514Arguments BUFFER-OR-NAME and NORECORD have the same meaning as
5515meaning as for `switch-to-buffer'. 5515for `switch-to-buffer'.
5516 5516
5517This function is intended for interactive use only. Lisp 5517This function is intended for interactive use only. Lisp
5518functions should call `pop-to-buffer-same-frame' instead." 5518functions 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.
5526The selected window will be used only if there is no other 5526The selected window will be used only if there is no other
5527choice. Windows on the selected frame are preferred to windows 5527choice. Windows on the selected frame are preferred to windows
5528on other frames. Optional arguments BUFFER-OR-NAME and NORECORD 5528on other frames. Arguments BUFFER-OR-NAME and NORECORD have the
5529have the same meaning as for `switch-to-buffer'. 5529same meaning as for `switch-to-buffer'.
5530 5530
5531This function is intended for interactive use only. Lisp 5531This function is intended for interactive use only. Lisp
5532functions should call `pop-to-buffer-other-window' instead." 5532functions 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.
5540The selected window or another frame will be used only if there 5540The selected window or another frame will be used only if there
5541is no other choice. Optional arguments BUFFER-OR-NAME and 5541is no other choice. Arguments BUFFER-OR-NAME and NORECORD have
5542NORECORD have the same meaning as for `switch-to-buffer'. 5542the same meaning as for `switch-to-buffer'.
5543 5543
5544This function is intended for interactive use only. Lisp 5544This function is intended for interactive use only. Lisp
5545functions should call `pop-to-buffer-other-window-same-frame' 5545functions 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.
5554The same frame will be used only if there is no other choice. 5554The same frame will be used only if there is no other choice.
5555Optional arguments BUFFER-OR-NAME and NORECORD have the same 5555Arguments BUFFER-OR-NAME and NORECORD have the same meaning
5556meaning as for `switch-to-buffer'. 5556as for `switch-to-buffer'.
5557 5557
5558This function is intended for interactive use only. Lisp 5558This function is intended for interactive use only. Lisp
5559functions should call `pop-to-buffer-other-frame' instead." 5559functions should call `pop-to-buffer-other-frame' instead."