diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2006-12-03 12:36:08 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2006-12-03 12:36:08 +0000 |
| commit | d0104e754a241cf83811fef30195d41201de533c (patch) | |
| tree | 6a5a31760801bd70649d0f9b132f61c46fac8445 /src/window.c | |
| parent | 19739b34866e6a4789d842961470123b50158612 (diff) | |
| parent | ab785936c82ac81edb8b20ac27c0558bc04797e5 (diff) | |
| download | emacs-d0104e754a241cf83811fef30195d41201de533c.tar.gz | |
Merged from emacs@sv.gnu.org.
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-486
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-487
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-488
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-489
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/gnus--rel--5.10--patch-156
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-157
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-158
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-159
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-160
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-587
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c index 0233c6bf79e..e996fc5c597 100644 --- a/src/window.c +++ b/src/window.c @@ -3590,7 +3590,7 @@ See `same-window-buffer-names' and `same-window-regexps'. */) DEFUN ("display-buffer", Fdisplay_buffer, Sdisplay_buffer, 1, 3, "BDisplay buffer: \nP", doc: /* Make BUFFER appear in some window but don't select it. -BUFFER must be the name of an existing buffer, or, when called from Lisp, +BUFFER must be the name of an existing buffer, or, when called from Lisp, a buffer. If BUFFER is shown already in some window, just use that one, unless the window is the selected window and the optional second |