diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-04-10 17:31:14 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-04-10 17:31:14 -0400 |
| commit | 369e974dc086452033227a5d350c357602c6274e (patch) | |
| tree | d480a3320659ae79e8f361591c5e4e66b40d8f71 /lisp/icomplete.el | |
| parent | 8a2cbd723c0b453b70dc1fcefe5b489f58605258 (diff) | |
| download | emacs-369e974dc086452033227a5d350c357602c6274e.tar.gz emacs-369e974dc086452033227a5d350c357602c6274e.tar.bz2 emacs-369e974dc086452033227a5d350c357602c6274e.zip | |
Fix bad interaction between icomplete and completion inline help (Bug#5849).
* lisp/minibuffer.el (completion-show-inline-help): New var.
(completion--do-completion, minibuffer-complete)
(minibuffer-force-complete, minibuffer-complete-word): Inhibit
minibuffer messages if completion-show-inline-help is nil.
* lisp/icomplete.el (icomplete-mode): Bind completion-show-inline-help
to avoid interference from inline help.
Diffstat (limited to 'lisp/icomplete.el')
| -rw-r--r-- | lisp/icomplete.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/icomplete.el b/lisp/icomplete.el index 490b2b2ebfc..ab67fcfcdfd 100644 --- a/lisp/icomplete.el +++ b/lisp/icomplete.el @@ -179,8 +179,11 @@ otherwise turn it off." (if icomplete-mode ;; The following is not really necessary after first time - ;; no great loss. - (add-hook 'minibuffer-setup-hook 'icomplete-minibuffer-setup) - (remove-hook 'minibuffer-setup-hook 'icomplete-minibuffer-setup))) + (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))) ;;;_ > icomplete-simple-completing-p () (defun icomplete-simple-completing-p () |