From 3c4921cc57cdf25c8de6a556a0df6f9bc170859b Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 28 Aug 2024 23:04:21 -0400 Subject: [PATCH] fix(popup): only remap quit-window in popup buffers --- modules/ui/popup/+hacks.el | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/ui/popup/+hacks.el b/modules/ui/popup/+hacks.el index f2c35ab9b..05dd44983 100644 --- a/modules/ui/popup/+hacks.el +++ b/modules/ui/popup/+hacks.el @@ -38,18 +38,17 @@ grows larger." ;; Don't try to resize popup windows (advice-add #'balance-windows :around #'+popup-save-a) -(defun +popup/quit-window () +(defun +popup/quit-window (&optional arg) "The regular `quit-window' sometimes kills the popup buffer and switches to a buffer that shouldn't be in a popup. We prevent that by remapping `quit-window' to this commmand." - (interactive) + (interactive "P") (let ((orig-buffer (current-buffer))) - (quit-window) + (quit-window arg) (when (and (eq orig-buffer (current-buffer)) (+popup-buffer-p)) (+popup/close nil 'force)))) -(global-set-key [remap quit-window] #'+popup/quit-window) - +(define-key +popup-buffer-mode-map [remap quit-window] #'+popup/quit-window) ;;