2 files changed, 7 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f9283730ebf..fc9a839a25b 100644
--- 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 341d544ef51..f082cc01d97 100644
--- 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)))