From 1179a227428f7bb06cb6c1cf0fbbbf91a536fed9 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 3 Feb 2017 08:05:13 -0500 Subject: [PATCH] autoload/popups: consider non-evil context for doom/popup-close-maybe --- core/autoload/popups.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/autoload/popups.el b/core/autoload/popups.el index 64b647477..63977af8b 100644 --- a/core/autoload/popups.el +++ b/core/autoload/popups.el @@ -95,7 +95,9 @@ possible rules." "Close the current popup *if* its window doesn't have a noesc parameter." (interactive) (if (window-parameter (selected-window) 'noesc) - (call-interactively 'evil-force-normal-state) + (call-interactively (if (featurep 'evil) + 'evil-force-normal-state + 'keyboard-escape-quit)) (doom/popup-close))) (defun doom--popup-data (window)