diff options
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 14 |
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 | ||
| 1665 | DEFUN ("switch-to-buffer", Fswitch_to_buffer, Sswitch_to_buffer, 1, 2, "BSwitch to buffer: ", | 1665 | DEFUN ("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. |
| 1667 | BUFFER may be a buffer or a buffer name. | 1667 | If BUFFER does not identify an existing buffer, |
| 1668 | then this function creates a buffer with that name. | ||
| 1669 | |||
| 1670 | When called from Lisp, BUFFER may be a buffer, a string \(a buffer name), | ||
| 1671 | or nil. If BUFFER is nil, then this function chooses a buffer | ||
| 1672 | using `other-buffer'. | ||
| 1668 | Optional second arg NORECORD non-nil means | 1673 | Optional second arg NORECORD non-nil means |
| 1669 | do not put this buffer at the front of the list of recently selected ones. | 1674 | do not put this buffer at the front of the list of recently selected ones. |
| 1675 | This function returns the buffer it switched to. | ||
| 1670 | 1676 | ||
| 1671 | WARNING: This is NOT the way to work on another buffer temporarily | 1677 | WARNING: This is NOT the way to work on another buffer temporarily |
| 1672 | within a Lisp program! Use `set-buffer' instead. That avoids messing with | 1678 | within a Lisp program! Use `set-buffer' instead. That avoids messing with |
| @@ -1689,11 +1695,15 @@ the window-buffer correspondences. */) | |||
| 1689 | 1695 | ||
| 1690 | DEFUN ("pop-to-buffer", Fpop_to_buffer, Spop_to_buffer, 1, 3, 0, | 1696 | DEFUN ("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. |
| 1692 | If BUFFER is nil, then some other buffer is chosen. | 1698 | BUFFER may be a buffer, a string \(a buffer name), or nil. |
| 1699 | If BUFFER is a string which is not the name of an existing buffer, | ||
| 1700 | then this function creates a buffer with that name. | ||
| 1701 | If BUFFER is nil, then it chooses some other buffer. | ||
| 1693 | If `pop-up-windows' is non-nil, windows can be split to do this. | 1702 | If `pop-up-windows' is non-nil, windows can be split to do this. |
| 1694 | If optional second arg OTHER-WINDOW is non-nil, insist on finding another | 1703 | If optional second arg OTHER-WINDOW is non-nil, insist on finding another |
| 1695 | window even if BUFFER is already visible in the selected window, | 1704 | window even if BUFFER is already visible in the selected window, |
| 1696 | and ignore `same-window-regexps' and `same-window-buffer-names'. | 1705 | and ignore `same-window-regexps' and `same-window-buffer-names'. |
| 1706 | This function returns the buffer it switched to. | ||
| 1697 | This uses the function `display-buffer' as a subroutine; see the documentation | 1707 | This uses the function `display-buffer' as a subroutine; see the documentation |
| 1698 | of `display-buffer' for additional customization information. | 1708 | of `display-buffer' for additional customization information. |
| 1699 | 1709 | ||