core-popups: read rules from local var

This commit is contained in:
Henrik Lissner 2017-05-14 14:36:49 +02:00
parent 17409e174d
commit 1ab5f86188
2 changed files with 2 additions and 2 deletions

View file

@ -104,7 +104,7 @@ only close popups that have an :autoclose property in their rule (see
"Close the current popup *if* its window doesn't have a noesc parameter." "Close the current popup *if* its window doesn't have a noesc parameter."
(interactive) (interactive)
(let ((window (selected-window))) (let ((window (selected-window)))
(if (window-parameter window :noesc) (if (plist-get doom-popup-rules :noesc)
(call-interactively (if (featurep 'evil) (call-interactively (if (featurep 'evil)
#'evil-force-normal-state #'evil-force-normal-state
#'keyboard-escape-quit)) #'keyboard-escape-quit))

View file

@ -230,7 +230,7 @@ properties."
(when (doom-popup-p window) (when (doom-popup-p window)
(when doom-popup-remember-history (when doom-popup-remember-history
(setq doom-popup-history (list (doom--popup-data window)))) (setq doom-popup-history (list (doom--popup-data window))))
(let ((autokill-p (window-parameter window :autokill))) (let ((autokill-p (plist-get doom-popup-rules :autokill)))
(with-selected-window window (with-selected-window window
(doom-popup-mode -1) (doom-popup-mode -1)
(when autokill-p (when autokill-p