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.

2 files changed, 9 insertions, 3 deletions

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  <cyd@stupidchicken.com>
+
+        * minibuffer.el (completion--do-completion): Avoid the "Next char
+        not unique" prompt if icomplete-mode is enabled (Bug#5849).
+
 2011-04-10  Stephen Berman <stephen.berman@gmx.net>
 
         * 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