From d2f7999c2942daaee4638970a0d0f2774ae3f31d Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 29 Jul 2020 14:22:44 -0400 Subject: [PATCH] Don't close treemacs on ESC #1970 --- modules/ui/popup/autoload/popup.el | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/ui/popup/autoload/popup.el b/modules/ui/popup/autoload/popup.el index ea6d6067f..62fd79014 100644 --- a/modules/ui/popup/autoload/popup.el +++ b/modules/ui/popup/autoload/popup.el @@ -181,8 +181,7 @@ and enables `+popup-buffer-mode'." (let ((window (or window (selected-window)))) (and (windowp window) (window-live-p window) - (or (window-parameter window 'popup) - (window-parameter window 'no-other-window)) + (window-parameter window 'popup) window)))) ;;;###autoload @@ -346,7 +345,13 @@ Any non-nil value besides the above will be used as the raw value for (defun +popup/other () "Cycle through popup windows, like `other-window'. Ignores regular windows." (interactive) - (if-let (popups (+popup-windows)) + (if-let (popups (cl-remove-if-not + (lambda (w) (or (+popup-window-p w) + ;; This command should be able to hop between + ;; windows with a `no-other-window' + ;; parameter, since `other-window' won't. + (window-parameter w 'no-other-window))) + (window-list))) (select-window (if (+popup-window-p) (let ((window (selected-window))) (or (car-safe (cdr (memq window popups)))