Mercurial > emacs
comparison src/buffer.c @ 89953:029a652ac817
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-23
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-442
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-444
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-445
Tweak permissions
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-446
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-450
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 11 Jul 2004 22:08:06 +0000 |
parents | 4c90ffeb71c5 f1ddf2e65cd3 |
children | b9eee0a7bef5 |
comparison
equal
deleted
inserted
replaced
89952:6f6e9fe4658b | 89953:029a652ac817 |
---|---|
1663 return buf; | 1663 return buf; |
1664 } | 1664 } |
1665 | 1665 |
1666 DEFUN ("switch-to-buffer", Fswitch_to_buffer, Sswitch_to_buffer, 1, 2, "BSwitch to buffer: ", | 1666 DEFUN ("switch-to-buffer", Fswitch_to_buffer, Sswitch_to_buffer, 1, 2, "BSwitch to buffer: ", |
1667 doc: /* Select buffer BUFFER in the current window. | 1667 doc: /* Select buffer BUFFER in the current window. |
1668 BUFFER may be a buffer or a buffer name. | 1668 If BUFFER does not identify an existing buffer, |
1669 then this function creates a buffer with that name. | |
1670 | |
1671 When called from Lisp, BUFFER may be a buffer, a string \(a buffer name), | |
1672 or nil. If BUFFER is nil, then this function chooses a buffer | |
1673 using `other-buffer'. | |
1669 Optional second arg NORECORD non-nil means | 1674 Optional second arg NORECORD non-nil means |
1670 do not put this buffer at the front of the list of recently selected ones. | 1675 do not put this buffer at the front of the list of recently selected ones. |
1676 This function returns the buffer it switched to. | |
1671 | 1677 |
1672 WARNING: This is NOT the way to work on another buffer temporarily | 1678 WARNING: This is NOT the way to work on another buffer temporarily |
1673 within a Lisp program! Use `set-buffer' instead. That avoids messing with | 1679 within a Lisp program! Use `set-buffer' instead. That avoids messing with |
1674 the window-buffer correspondences. */) | 1680 the window-buffer correspondences. */) |
1675 (buffer, norecord) | 1681 (buffer, norecord) |
1688 return switch_to_buffer_1 (buffer, norecord); | 1694 return switch_to_buffer_1 (buffer, norecord); |
1689 } | 1695 } |
1690 | 1696 |
1691 DEFUN ("pop-to-buffer", Fpop_to_buffer, Spop_to_buffer, 1, 3, 0, | 1697 DEFUN ("pop-to-buffer", Fpop_to_buffer, Spop_to_buffer, 1, 3, 0, |
1692 doc: /* Select buffer BUFFER in some window, preferably a different one. | 1698 doc: /* Select buffer BUFFER in some window, preferably a different one. |
1693 If BUFFER is nil, then some other buffer is chosen. | 1699 BUFFER may be a buffer, a string \(a buffer name), or nil. |
1700 If BUFFER is a string which is not the name of an existing buffer, | |
1701 then this function creates a buffer with that name. | |
1702 If BUFFER is nil, then it chooses some other buffer. | |
1694 If `pop-up-windows' is non-nil, windows can be split to do this. | 1703 If `pop-up-windows' is non-nil, windows can be split to do this. |
1695 If optional second arg OTHER-WINDOW is non-nil, insist on finding another | 1704 If optional second arg OTHER-WINDOW is non-nil, insist on finding another |
1696 window even if BUFFER is already visible in the selected window, | 1705 window even if BUFFER is already visible in the selected window, |
1697 and ignore `same-window-regexps' and `same-window-buffer-names'. | 1706 and ignore `same-window-regexps' and `same-window-buffer-names'. |
1707 This function returns the buffer it switched to. | |
1698 This uses the function `display-buffer' as a subroutine; see the documentation | 1708 This uses the function `display-buffer' as a subroutine; see the documentation |
1699 of `display-buffer' for additional customization information. | 1709 of `display-buffer' for additional customization information. |
1700 | 1710 |
1701 Optional third arg NORECORD non-nil means | 1711 Optional third arg NORECORD non-nil means |
1702 do not put this buffer at the front of the list of recently selected ones. */) | 1712 do not put this buffer at the front of the list of recently selected ones. */) |