diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-04-10 17:07:40 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-04-10 17:07:40 -0400 |
| commit | 6f21a3198d25844445ab58a5f08d968197e5ea4e (patch) | |
| tree | 09db6ade3ebe989ccb43ec7ce7591639e83507dc /lisp/minibuffer.el | |
| parent | fde4eb868f9ec91cb3a281f798da2c0ebdadd5a3 (diff) | |
| download | emacs-6f21a3198d25844445ab58a5f08d968197e5ea4e.tar.gz | |
Fix completion-auto-help/icomplete-mode bad interaction (Bug#5849).
* minibuffer.el (completion--do-completion): Avoid the "Next char
not unique" prompt if icomplete-mode is enabled.
Diffstat (limited to 'lisp/minibuffer.el')
| -rw-r--r-- | lisp/minibuffer.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 338ab4e281e..adbb9a6c539 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -574,9 +574,10 @@ E = after completion we now have an Exact match. ;; Show the completion table, if requested. (cond ((not exact) - (if (case completion-auto-help - (lazy (eq this-command last-command)) - (t completion-auto-help)) + (if (cond (icomplete-mode t) + ((eq completion-auto-help 'lazy) + (eq this-command last-command)) + (t completion-auto-help)) (minibuffer-completion-help) (minibuffer-message "Next char not unique"))) ;; If the last exact completion and this one were the same, it |