summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredrik Bergroth <fbergroth@gmail.com>2017-12-07 12:19:54 +0100
committerJames N <james@jojojames.com>2017-12-07 05:04:36 -0800
commit515a66b3351af1a64d0832ca497f766141ac8ce9 (patch)
tree05182e8911915a869a13e3d405e56867424c3e71
parent81923376e2467cbae05b85ba60ee0c539ef54699 (diff)
minibuffer: Setup keybindings in ivy-minibuffer-map
-rw-r--r--evil-collection-minibuffer.el6
1 files changed, 6 insertions, 0 deletions
diff --git a/evil-collection-minibuffer.el b/evil-collection-minibuffer.el
index 97bb1f8..a1e8827 100644
--- a/evil-collection-minibuffer.el
+++ b/evil-collection-minibuffer.el
@@ -58,6 +58,12 @@ it does not have a mode."
minibuffer-local-isearch-map))
(evil-define-key* 'normal map (kbd "<escape>") 'abort-recursive-edit)
(evil-define-key* 'normal map (kbd "<return>") 'exit-minibuffer))
+
+ (with-eval-after-load 'ivy
+ (defvar ivy-minibuffer-map)
+ (evil-define-key* 'normal ivy-minibuffer-map (kbd "<escape>") 'abort-recursive-edit)
+ (evil-define-key* 'normal ivy-minibuffer-map (kbd "<return>") 'exit-minibuffer))
+
(add-hook 'minibuffer-setup-hook 'evil-collection-minibuffer-insert)
;; Because of the above minibuffer-setup-hook, some evil-ex bindings need be reset.
(evil-define-key 'normal evil-ex-completion-map (kbd "<escape>") 'abort-recursive-edit)