diff options
| author | Stefan Monnier | 2011-10-01 20:25:27 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2011-10-01 20:25:27 -0400 |
| commit | 51553db66b4eb8bc7a0d1a1c3206e097e0cc94fa (patch) | |
| tree | bd3013fb6aedcd932b223990d6764e13531e0ec9 /src | |
| parent | 487ffd7a8cb70b7f6fd1cf60b5d8c09ac7d1e0d7 (diff) | |
| download | emacs-51553db66b4eb8bc7a0d1a1c3206e097e0cc94fa.tar.gz emacs-51553db66b4eb8bc7a0d1a1c3206e097e0cc94fa.zip | |
* src/minibuf.c (Finternal_complete_buffer): Only show internal buffers if
they've been requested explicitly.
Fixes: debbugs:9591
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/minibuf.c | 4 |
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 @@ | |||
| 1 | 2011-10-02 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * minibuf.c (Finternal_complete_buffer): Only show internal buffers if | ||
| 4 | they've been requested explicitly (bug#9591). | ||
| 5 | |||
| 1 | 2011-10-01 Andreas Schwab <schwab@linux-m68k.org> | 6 | 2011-10-01 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 7 | ||
| 3 | * keymap.c (Fsingle_key_description): Use make_specified_string | 8 | * 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', | |||
| 1859 | /* First, look for a non-internal buffer in `res'. */ | 1859 | /* First, look for a non-internal buffer in `res'. */ |
| 1860 | while (CONSP (bufs) && SREF (XCAR (bufs), 0) == ' ') | 1860 | while (CONSP (bufs) && SREF (XCAR (bufs), 0) == ' ') |
| 1861 | bufs = XCDR (bufs); | 1861 | bufs = XCDR (bufs); |
| 1862 | if (NILP (bufs)) | 1862 | if (NILP (bufs) && EQ (Flength (res), Flength (Vbuffer_alist))) |
| 1863 | /* All bufs in `res' are internal, so don't trip them out. */ | 1863 | /* All bufs are internal, so don't trip them out. */ |
| 1864 | return res; | 1864 | return res; |
| 1865 | res = bufs; | 1865 | res = bufs; |
| 1866 | while (CONSP (XCDR (bufs))) | 1866 | while (CONSP (XCDR (bufs))) |