emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix evil-escape in evil-collection-powered minibuffer

Browse source
This commit is contained in:
Henrik Lissner 2020-05-01 18:39:40 -04:00
parent e4f24fd150
commit 69868a8f47
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/editor/evil/config.el
View file

@ -280,8 +280,13 @@ directives. By default, this only recognizes C directives.")
evil-escape-delay 0.15)
(evil-define-key* '(insert replace visual operator) 'global "\C-g" #'evil-escape)
:config
;; no `evil-escape' in minibuffer
(add-hook 'evil-escape-inhibit-functions #'minibufferp)
;; no `evil-escape' in minibuffer, unless `evil-collection-setup-minibuffer'
;; is enabled, where we could be in insert mode in the minibuffer.
(add-hook! 'evil-escape-inhibit-functions
(defun +evil-inhibit-escape-in-minibuffer-fn ()
(and (minibufferp)
(or (not (bound-and-true-p evil-collection-setup-minibuffer))
(evil-normal-state-p)))))
;; so that evil-escape-mode-hook runs, and can be toggled by evil-mc
(evil-escape-mode +1))