diff src/buffer.c @ 83113:1a68e4b22355

Merged in changes from CVS trunk. Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-241 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-242 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-243 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-244 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-245 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-246 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-247 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-248 src/lisp.h (CYCLE_CHECK): Macro moved from xfaces.c * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-249 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-250 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-251 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-252 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-253 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-254 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-255 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-153

--- a/src/buffer.c	Fri Apr 23 14:44:11 2004 +0000
+++ b/src/buffer.c	Tue Apr 27 15:53:30 2004 +0000
@@ -1683,7 +1683,7 @@
        doc: /* Select buffer BUFFER in some window, preferably a different one.
 If BUFFER is nil, then some other buffer is chosen.
 If `pop-up-windows' is non-nil, windows can be split to do this.
-If optional second arg OTHER-WINDOW is nil, insist on finding another
+If optional second arg OTHER-WINDOW is non-nil, insist on finding another
 window even if BUFFER is already visible in the selected window,
 and ignore `same-window-regexps' and `same-window-buffer-names'.
 This uses the function `display-buffer' as a subroutine; see the documentation