From: Johan Bockgård Date: Sun, 18 Sep 2011 16:13:01 +0000 (-0400) Subject: Fix previous fix of Bug#5849. X-Git-Tag: emacs-pretest-24.0.90~100 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2176854d0f9ac69351a785e8787271d7ee43252f;p=emacs.git 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 6b8056ba03f..a08e8c2f91b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2011-09-18 Johan BockgÃ¥rd + + * 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 * woman.el (woman2-process-escapes): Don't delete unrecognized diff --git a/lisp/icomplete.el b/lisp/icomplete.el index 5f3680630f4..bdd19194c22 100644 --- 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)