From 0cb1930d8aaea249fae90cf9ff5cf9859443fb82 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 27 May 2016 15:46:52 -0400 Subject: [PATCH] popups: fix inescapable-modes condition --- core/defuns/defuns-popups.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/defuns/defuns-popups.el b/core/defuns/defuns-popups.el index 1d5f0bd19..14b488995 100644 --- a/core/defuns/defuns-popups.el +++ b/core/defuns/defuns-popups.el @@ -114,8 +114,8 @@ (local-set-key [escape escape] 'doom/popup-close) (let ((map evil-normal-state-local-map)) (define-key map [escape escape] 'doom/popup-close) - (unless (or (apply #'derived-mode-p doom-popup-inescapable-modes) - (--any? (string-match-p it buffer-name) (-filter 'stringp doom-popup-inescapable-modes))) + (unless (and (apply #'derived-mode-p doom-popup-inescapable-modes) + (--any? (string-match-p it (buffer-name)) (-filter 'stringp doom-popup-inescapable-modes))) (define-key map [escape] 'doom/popup-close) (define-key map (kbd "ESC") 'doom/popup-close))) (when (or (apply #'derived-mode-p doom-popup-protect-modes)