aboutsummaryrefslogtreecommitdiff
path: root/evil-core.el
diff options
context:
space:
mode:
authorJames Nguyen <james@jojojames.com>2017-06-24 10:00:15 -0700
committerJames Nguyen <james@jojojames.com>2017-06-24 10:03:33 -0700
commitb3067724037b04470bd36fb0996d9d07d4489414 (patch)
tree998922ca091428658a866cdab7fb52efee0e291b /evil-core.el
parentd35f3a225feb27002b2aa207e955ca7b305b9ca8 (diff)
Use evil-esc in minibuffers
This avoids having to input ESC ESC ESC in Terminals when trying to exit out of Minibuffer/Ivy/Helm/etc. Can then write something like this for Ivy to escape out. (eval-after-load 'evil (lambda () (define-key ivy-minibuffer-map [escape] 'minibuffer-keyboard-quit)))
Diffstat (limited to 'evil-core.el')
-rw-r--r--evil-core.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/evil-core.el b/evil-core.el
index a27857c..a6a3208 100644
--- a/evil-core.el
+++ b/evil-core.el
@@ -625,7 +625,8 @@ happen when the keymap is accessed from `read-key-sequence'. In
particular, if it is access from `define-key' the returned
mapping will always be the ESC prefix map."
(if (and (not evil-inhibit-esc)
- (or evil-local-mode (evil-ex-p))
+ (or evil-local-mode (evil-ex-p)
+ (active-minibuffer-window))
(not (evil-emacs-state-p))
(let ((keys (this-single-command-keys)))
(and (> (length keys) 0)