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

evil: don't use doom/popup-close explicitly in doom*evil-esc-quit

Browse source
This commit is contained in:
Henrik Lissner 2016-06-17 23:51:18 -04:00
parent 9cf8d08ac4
commit 9ecbc86847
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
core/defuns/defuns-evil.el
View file

@ -192,15 +192,13 @@ monkey patch it to use pop-to-buffer."
;;;###autoload
(defun doom*evil-esc-quit ()
"Close popups, disable search highlights and quit the minibuffer if open."
(if (and (doom/popup-p) (memq :noesc doom-popup-rule))
(doom/popup-close)
(let ((minib-p (minibuffer-window-active-p (minibuffer-window)))
(evil-hl-p (evil-ex-hl-active-p 'evil-ex-search)))
(when minib-p (abort-recursive-edit))
(when evil-hl-p (evil-ex-nohighlight))
;; Close non-repl popups and clean up `doom-popup-windows'
(unless (or minib-p evil-hl-p)
(doom/popup-close-all)))))
(let ((minib-p (minibuffer-window-active-p (minibuffer-window)))
(evil-hl-p (evil-ex-hl-active-p 'evil-ex-search)))
(when minib-p (abort-recursive-edit))
(when evil-hl-p (evil-ex-nohighlight))
;; Close non-repl popups and clean up `doom-popup-windows'
(unless (or minib-p evil-hl-p)
(doom/popup-close-all))))
;;;###autoload
(defun doom*evil-ex-replace-special-filenames (file-name)