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

core-popups: don't quit popups on ESC from other buffers

Browse source
This commit is contained in:
Henrik Lissner 2017-02-19 19:04:57 -05:00
parent 941f3abc6f
commit 69e40eaf67
1 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/core-popups.el
View file

@ -191,17 +191,9 @@ prevent popups from messaging up the UI (or vice versa)."
(define-key map [remap evil-force-normal-state] 'doom/popup-close-maybe)) (define-key map [remap evil-force-normal-state] 'doom/popup-close-maybe))
;; Make evil-mode cooperate with popups ;; Make evil-mode cooperate with popups
(advice-add 'evil-force-normal-state :before 'doom*popup-evil-close-on-esc)
(advice-add 'evil-command-window :override 'doom*popup-evil-command-window) (advice-add 'evil-command-window :override 'doom*popup-evil-command-window)
(advice-add 'evil-command-window-execute :override 'doom*popup-evil-command-window-execute) (advice-add 'evil-command-window-execute :override 'doom*popup-evil-command-window-execute)
(defun doom*popup-evil-close-on-esc ()
"Close non-repl popups and clean up `doom-popup-windows' when you press ESC
from normal mode in any buffer."
(unless (or (minibuffer-window-active-p (minibuffer-window))
(evil-ex-hl-active-p 'evil-ex-search))
(doom/popup-close-all)))
(defun doom*popup-evil-command-window (hist cmd-key execute-fn) (defun doom*popup-evil-command-window (hist cmd-key execute-fn)
"The evil command window has a mind of its own (uses `switch-to-buffer'). We "The evil command window has a mind of its own (uses `switch-to-buffer'). We
monkey patch it to use pop-to-buffer, and to remember the previous window." monkey patch it to use pop-to-buffer, and to remember the previous window."