martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid fido-mode's setup on non-icomplete minibuffers

Browse Source 
Otherwise we would lose things like C-r (isearch-backward) when doing
simple stuff like non-icomplete pp-eval-expression.

* lisp/icomplete.el (icomplete--fido-mode-setup): Restrict setup
to when icomplete-mode really kicks in.
This commit is contained in:
João Távora
2019-11-13 09:47:25 +00:00
parent 0a492e4dfa
commit bf7debec3b
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lisp/icomplete.el
View File

@@ -319,13 +319,14 @@ require user confirmation."
(defun icomplete--fido-mode-setup ()
"Setup `fido-mode''s minibuffer."
(use-local-map (make-composed-keymap icomplete-fido-mode-map
(current-local-map)))
(setq-local icomplete-tidy-shadowed-file-names t
icomplete-show-matches-on-no-input t
icomplete-hide-common-prefix nil
completion-styles '(flex)
completion-category-defaults nil))
(when (and icomplete-mode (icomplete-simple-completing-p))
(use-local-map (make-composed-keymap icomplete-fido-mode-map
(current-local-map)))
(setq-local icomplete-tidy-shadowed-file-names t
icomplete-show-matches-on-no-input t
icomplete-hide-common-prefix nil
completion-styles '(flex)
completion-category-defaults nil)))
;;;###autoload
(define-minor-mode fido-mode