* src/minibuf.c (Finternal_complete_buffer): Only show internal buffers if

they've been requested explicitly.

Fixes: debbugs:9591

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3b177ac07bf2fb39143e5796122d991b37ba1988..4fcca274b06ce5d702073f841a4f6391c0cd4e96 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -582,7 +582,7 @@
 
        * help.el (describe-key-briefly): Copy previous standard-output change.
 
-2011-09-13  PJ Weisberg  <pj@irregularexpressions.net>  (tiny change)
+2011-09-13  PJ Weisberg  <pj@irregularexpressions.net>
 
        * help.el (where-is): Respect non-standard standard-output.  (Bug#9030)
 

diff --git a/src/ChangeLog b/src/ChangeLog
index f9283730ebf2ca77414a35e1fab92d24f20ae5cb..fc9a839a25b03e9362d18833109f1826c021e030 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * minibuf.c (Finternal_complete_buffer): Only show internal buffers if
+       they've been requested explicitly (bug#9591).
+
 2011-10-01  Andreas Schwab  <schwab@linux-m68k.org>
 
        * keymap.c (Fsingle_key_description): Use make_specified_string

diff --git a/src/minibuf.c b/src/minibuf.c
index 341d544ef51a4a64779b7b6e4a4d91275cc79121..f082cc01d975d561aa3521198efbe83b329fe9aa 100644 (file)
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1859,8 +1859,8 @@ The arguments STRING and PREDICATE are as in `try-completion',
          /* First, look for a non-internal buffer in `res'.  */
          while (CONSP (bufs) && SREF (XCAR (bufs), 0) == ' ')
            bufs = XCDR (bufs);
-         if (NILP (bufs))
-           /* All bufs in `res' are internal, so don't trip them out.  */
+         if (NILP (bufs) && EQ (Flength (res), Flength (Vbuffer_alist)))
+           /* All bufs are internal, so don't trip them out.  */
            return res;
          res = bufs;
          while (CONSP (XCDR (bufs)))