From: Chong Yidong Date: Sun, 10 Apr 2011 21:07:40 +0000 (-0400) Subject: Fix completion-auto-help/icomplete-mode bad interaction (Bug#5849). X-Git-Tag: emacs-pretest-24.0.90~104^3~75 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6f21a3198d25844445ab58a5f08d968197e5ea4e;p=emacs.git 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. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c89bb3f281a..cbfbd2b71f1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-04-10 Chong Yidong + + * minibuffer.el (completion--do-completion): Avoid the "Next char + not unique" prompt if icomplete-mode is enabled (Bug#5849). + 2011-04-10 Stephen Berman * textmodes/page.el (what-page): Use line-number-at-pos to 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