diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-10-12 09:48:12 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-10-12 09:48:12 -0700 |
| commit | 682432fc544c2bb4e0531c2931d43bce085eb16a (patch) | |
| tree | 4bc9e4d78f34e19254382246b89a3462a0186311 /src/minibuf.c | |
| parent | d44287d4adc1e268ef9974ea72010f0186f40197 (diff) | |
| parent | 79beb1785aac3f8326f58710462e4b6be7f0449a (diff) | |
| download | emacs-682432fc544c2bb4e0531c2931d43bce085eb16a.tar.gz | |
Merge from trunk.
Diffstat (limited to 'src/minibuf.c')
| -rw-r--r-- | src/minibuf.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index 9b905f748bb..0d2bc7234eb 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1859,9 +1859,10 @@ 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) && 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) == ' ') |