master bf7debe: Avoid fido-mode's setup on non-icomplete minibuffers

[João Távora]

branch: master
commit bf7debec3b2cdc4a5bc00c62046a6cb24c3f32af
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>

    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.
---
 lisp/icomplete.el | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index d0d3d65..a732d4c 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