aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLuc Teirlinck2004-07-11 02:36:00 +0000
committerLuc Teirlinck2004-07-11 02:36:00 +0000
commita6dced2a681349e6a2744bd73c79b3ce24e5ade2 (patch)
tree17cb2106d33209c611a24a999c08c8d7227b8d7d /src
parent839857c7bdeab1cfc27f10245a7ef28d9e639e3d (diff)
downloademacs-a6dced2a681349e6a2744bd73c79b3ce24e5ade2.tar.gz
emacs-a6dced2a681349e6a2744bd73c79b3ce24e5ade2.zip
(Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
Diffstat (limited to 'src')
-rw-r--r--src/buffer.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 031f5da8e6e..c5783ade2a0 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1664,9 +1664,15 @@ switch_to_buffer_1 (buffer, norecord)
1664 1664
1665DEFUN ("switch-to-buffer", Fswitch_to_buffer, Sswitch_to_buffer, 1, 2, "BSwitch to buffer: ", 1665DEFUN ("switch-to-buffer", Fswitch_to_buffer, Sswitch_to_buffer, 1, 2, "BSwitch to buffer: ",
1666 doc: /* Select buffer BUFFER in the current window. 1666 doc: /* Select buffer BUFFER in the current window.
1667BUFFER may be a buffer or a buffer name. 1667If BUFFER does not identify an existing buffer,
1668then this function creates a buffer with that name.
1669
1670When called from Lisp, BUFFER may be a buffer, a string \(a buffer name),
1671or nil. If BUFFER is nil, then this function chooses a buffer
1672using `other-buffer'.
1668Optional second arg NORECORD non-nil means 1673Optional second arg NORECORD non-nil means
1669do not put this buffer at the front of the list of recently selected ones. 1674do not put this buffer at the front of the list of recently selected ones.
1675This function returns the buffer it switched to.
1670 1676
1671WARNING: This is NOT the way to work on another buffer temporarily 1677WARNING: This is NOT the way to work on another buffer temporarily
1672within a Lisp program! Use `set-buffer' instead. That avoids messing with 1678within a Lisp program! Use `set-buffer' instead. That avoids messing with
@@ -1689,11 +1695,15 @@ the window-buffer correspondences. */)
1689 1695
1690DEFUN ("pop-to-buffer", Fpop_to_buffer, Spop_to_buffer, 1, 3, 0, 1696DEFUN ("pop-to-buffer", Fpop_to_buffer, Spop_to_buffer, 1, 3, 0,
1691 doc: /* Select buffer BUFFER in some window, preferably a different one. 1697 doc: /* Select buffer BUFFER in some window, preferably a different one.
1692If BUFFER is nil, then some other buffer is chosen. 1698BUFFER may be a buffer, a string \(a buffer name), or nil.
1699If BUFFER is a string which is not the name of an existing buffer,
1700then this function creates a buffer with that name.
1701If BUFFER is nil, then it chooses some other buffer.
1693If `pop-up-windows' is non-nil, windows can be split to do this. 1702If `pop-up-windows' is non-nil, windows can be split to do this.
1694If optional second arg OTHER-WINDOW is non-nil, insist on finding another 1703If optional second arg OTHER-WINDOW is non-nil, insist on finding another
1695window even if BUFFER is already visible in the selected window, 1704window even if BUFFER is already visible in the selected window,
1696and ignore `same-window-regexps' and `same-window-buffer-names'. 1705and ignore `same-window-regexps' and `same-window-buffer-names'.
1706This function returns the buffer it switched to.
1697This uses the function `display-buffer' as a subroutine; see the documentation 1707This uses the function `display-buffer' as a subroutine; see the documentation
1698of `display-buffer' for additional customization information. 1708of `display-buffer' for additional customization information.
1699 1709