procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix previous fix of Bug#5849.

Browse source 
* icomplete.el (icomplete-mode): Don't set completion-show-inline-help.
(icomplete-minibuffer-setup): Set completion-show-inline-help
locally during icompletion.
This commit is contained in:
Johan Bockgård 2011-09-18 12:13:01 -04:00 • committed by Chong Yidong
parent c940224fe6
commit 2176854d0f
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -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

8
lisp/icomplete.el
View file

@ -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)