diff options
| author | João Távora <joaotavora@gmail.com> | 2019-11-13 09:47:25 +0000 |
|---|---|---|
| committer | João Távora <joaotavora@gmail.com> | 2019-11-13 09:49:47 +0000 |
| commit | bf7debec3b2cdc4a5bc00c62046a6cb24c3f32af (patch) | |
| tree | 3ac62f10c8a43ae269f1fbec51df399cd9d90b9e /lisp/icomplete.el | |
| parent | 0a492e4dfa188f32fd04cdf95c9fa6324facae08 (diff) | |
| download | emacs-bf7debec3b2cdc4a5bc00c62046a6cb24c3f32af.tar.gz | |
Avoid fido-mode's setup on non-icomplete minibuffers
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.
Diffstat (limited to 'lisp/icomplete.el')
| -rw-r--r-- | lisp/icomplete.el | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lisp/icomplete.el b/lisp/icomplete.el index d0d3d65c346..a732d4cc0d1 100644 --- a/lisp/icomplete.el +++ b/lisp/icomplete.el @@ -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 |