Mercurial > emacs
comparison src/buffer.c @ 83113:1a68e4b22355
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-241
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-242
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-243
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-244
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-245
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-246
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-247
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-248
src/lisp.h (CYCLE_CHECK): Macro moved from xfaces.c
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-249
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-250
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-251
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-252
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-253
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-254
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-255
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-153
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Tue, 27 Apr 2004 15:53:30 +0000 |
| parents | 625059157bad 98453142b576 |
| children | 6ae3d2810507 |
comparison
equal
deleted
inserted
replaced
| 83112:30dd490f06f2 | 83113:1a68e4b22355 |
|---|---|
| 1681 | 1681 |
| 1682 DEFUN ("pop-to-buffer", Fpop_to_buffer, Spop_to_buffer, 1, 3, 0, | 1682 DEFUN ("pop-to-buffer", Fpop_to_buffer, Spop_to_buffer, 1, 3, 0, |
| 1683 doc: /* Select buffer BUFFER in some window, preferably a different one. | 1683 doc: /* Select buffer BUFFER in some window, preferably a different one. |
| 1684 If BUFFER is nil, then some other buffer is chosen. | 1684 If BUFFER is nil, then some other buffer is chosen. |
| 1685 If `pop-up-windows' is non-nil, windows can be split to do this. | 1685 If `pop-up-windows' is non-nil, windows can be split to do this. |
| 1686 If optional second arg OTHER-WINDOW is nil, insist on finding another | 1686 If optional second arg OTHER-WINDOW is non-nil, insist on finding another |
| 1687 window even if BUFFER is already visible in the selected window, | 1687 window even if BUFFER is already visible in the selected window, |
| 1688 and ignore `same-window-regexps' and `same-window-buffer-names'. | 1688 and ignore `same-window-regexps' and `same-window-buffer-names'. |
| 1689 This uses the function `display-buffer' as a subroutine; see the documentation | 1689 This uses the function `display-buffer' as a subroutine; see the documentation |
| 1690 of `display-buffer' for additional customization information. | 1690 of `display-buffer' for additional customization information. |
| 1691 | 1691 |
