Fix previous fix of Bug#5849.

* icomplete.el (icomplete-mode): Don't set completion-show-inline-help.
(icomplete-minibuffer-setup): Set completion-show-inline-help
locally during icompletion.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6b8056ba03f55be853bfe069b5d7f3d0e9046e57..a08e8c2f91bce8e8253714e788e8bedfdaeb7d29 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2011-09-18  Johan Bockgård  <bojohan@gnu.org>
+
+       * icomplete.el: Fix previous fix of Bug#5849.
+       (icomplete-mode): Don't set completion-show-inline-help.
+       (icomplete-minibuffer-setup): Set completion-show-inline-help
+       locally during icompletion.
+
 2011-09-18  Chong Yidong  <cyd@stupidchicken.com>
 
        * woman.el (woman2-process-escapes): Don't delete unrecognized

diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 5f3680630f4f0c31eda1adebbc8958f21cb4d106..bdd19194c22b1a0a67db05e761e368dbb830ea8c 100644 (file)
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -179,11 +179,8 @@ otherwise turn it off."
   (if icomplete-mode
       ;; The following is not really necessary after first time -
       ;; no great loss.
-      (progn
-       (setq completion-show-inline-help nil)
-       (add-hook 'minibuffer-setup-hook 'icomplete-minibuffer-setup))
-    (remove-hook 'minibuffer-setup-hook 'icomplete-minibuffer-setup)
-    (setq completion-show-inline-help t)))
+      (add-hook 'minibuffer-setup-hook 'icomplete-minibuffer-setup)
+    (remove-hook 'minibuffer-setup-hook 'icomplete-minibuffer-setup)))
 
 ;;;_ > icomplete-simple-completing-p ()
 (defun icomplete-simple-completing-p ()
@@ -209,6 +206,7 @@ Conditions are:
   "Run in minibuffer on activation to establish incremental completion.
 Usually run by inclusion in `minibuffer-setup-hook'."
   (when (and icomplete-mode (icomplete-simple-completing-p))
+    (set (make-local-variable 'completion-show-inline-help) nil)
     (add-hook 'pre-command-hook
              (lambda () (run-hooks 'icomplete-pre-command-hook))
              nil t)