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

Refactor +evil-esc-hook

Browse source
This commit is contained in:
Henrik Lissner 2017-05-25 12:22:05 +02:00
parent 5d47be15ef
commit 85751c519b
5 changed files with 36 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

23
core/core-popups.el
View file

@ -296,21 +296,14 @@ properties."
(define-key map [remap evil-window-vsplit] #'ignore))
(defun doom|popup-close-maybe ()
"Close the current window if it's a popup with no :noesc property."
(when (and (doom-popup-p)
(not (doom-popup-prop :noesc)))
(delete-window)))
(add-hook '+evil-esc-hook #'doom|popup-close-maybe)
(defun doom|popup-close-all-maybe ()
"Close popups with an :autoclose property when pressing ESC from normal
mode in any evil-mode buffer."
(unless (or (doom-popup-p)
(minibuffer-window-active-p (minibuffer-window))
(and (bound-and-true-p evil-mode)
(evil-ex-hl-active-p 'evil-ex-search)))
(doom/popup-close-all)))
(add-hook '+evil-esc-hook #'doom|popup-close-all-maybe)
"If current window is a popup, close it. If minibuffer is open, close it. If
not in a popup, close all popups with an :autoclose property."
(cond ((doom-popup-p)
(unless (doom-popup-prop :noesc)
(delete-window)))
(t
(doom/popup-close-all))))
(add-hook '+evil-esc-hook #'doom|popup-close-maybe t)
;; Make evil-mode cooperate with popups
(advice-add #'evil-command-window :override #'doom*popup-evil-command-window)