Merged in changes from CVS HEAD

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-126
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-127
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-128
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-129
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-130
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-131
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-132
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-133
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-134
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-135
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-136
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-137
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-112

1 files changed, 3 insertions, 2 deletions

diff --git a/src/buffer.c b/src/buffer.c
index ad1dde93da7..27b12845c50 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1675,8 +1675,9 @@ DEFUN ("pop-to-buffer", Fpop_to_buffer, Spop_to_buffer, 1, 3, 0,
        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 non-nil, insist on finding another
-window even if BUFFER is already visible in the selected window.
+If optional second arg OTHER-WINDOW is 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
 of `display-buffer' for additional customization information.