[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100551: Fix completion-auto-help/icomplete-mode bad interaction (Bug#5849).

[Chong Yidong]

------------------------------------------------------------
revno: 100551
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Sun 2011-04-10 17:07:40 -0400
message:
  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.
modified:
  lisp/ChangeLog
  lisp/minibuffer.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-04-10 20:52:31 +0000
+++ b/lisp/ChangeLog    2011-04-10 21:07:40 +0000
@@ -1,3 +1,8 @@
+2011-04-10  Chong Yidong  <address@hidden>
+
+       * minibuffer.el (completion--do-completion): Avoid the "Next char
+       not unique" prompt if icomplete-mode is enabled (Bug#5849).
+
 2011-04-10  Stephen Berman <address@hidden>
 
        * textmodes/page.el (what-page): Use line-number-at-pos to

=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el        2011-01-02 23:50:46 +0000
+++ b/lisp/minibuffer.el        2011-04-10 21:07:40 +0000
@@ -574,9 +574,10 @@
               ;; 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