[Emacs-diffs] /srv/bzr/emacs/trunk r106054: * minibuf.c (Finternal_complete_buffer): Fix last change.

[Stefan Monnier]

------------------------------------------------------------
revno: 106054
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9709
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2011-10-11 13:32:38 -0400
message:
  * minibuf.c (Finternal_complete_buffer): Fix last change.
modified:
  src/ChangeLog
  src/minibuf.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-10-08 21:07:23 +0000
+++ b/src/ChangeLog     2011-10-11 17:32:38 +0000
@@ -1,3 +1,7 @@
+2011-10-11  Stefan Monnier  <address@hidden>
+
+       * minibuf.c (Finternal_complete_buffer): Fix last change (bug#9709).
+
 2011-10-08  Glenn Morris  <address@hidden>
 
        * callint.c (Fcall_interactively): Give a more explicit error for the

=== modified file 'src/minibuf.c'
--- a/src/minibuf.c     2011-10-02 00:25:27 +0000
+++ b/src/minibuf.c     2011-10-11 17:32:38 +0000
@@ -1859,9 +1859,10 @@
          /* First, look for a non-internal buffer in `res'.  */
          while (CONSP (bufs) && SREF (XCAR (bufs), 0) == ' ')
            bufs = XCDR (bufs);
-         if (NILP (bufs) && EQ (Flength (res), Flength (Vbuffer_alist)))
-           /* All bufs are internal, so don't trip them out.  */
-           return res;
+         if (NILP (bufs))
+           return (EQ (Flength (res), Flength (Vbuffer_alist))
+                   /* If all bufs are internal don't strip them out.  */
+                   ? res : bufs);
          res = bufs;
          while (CONSP (XCDR (bufs)))
            if (SREF (XCAR (XCDR (bufs)), 0) == ' ')