[Emacs-diffs] /srv/bzr/emacs/trunk r105824: Fix previous fix of Bug#5849.

[Chong Yidong]

------------------------------------------------------------
revno: 105824
author: Johan Bockgård  <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2011-09-18 12:13:01 -0400
message:
  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.
modified:
  lisp/ChangeLog
  lisp/icomplete.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-18 16:03:48 +0000
+++ b/lisp/ChangeLog    2011-09-18 16:13:01 +0000
@@ -1,3 +1,10 @@
+2011-09-18  Johan Bockgård  <address@hidden>
+
+       * 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  <address@hidden>
 
        * woman.el (woman2-process-escapes): Don't delete unrecognized

=== modified file 'lisp/icomplete.el'
--- a/lisp/icomplete.el 2011-05-31 03:03:38 +0000
+++ b/lisp/icomplete.el 2011-09-18 16:13:01 +0000
@@ -179,11 +179,8 @@
   (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 @@
   "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)