From d6f62ff55aa722456e5fcf2bd8cb431a626347f2 Mon Sep 17 00:00:00 2001 From: Adrián Medraño Calvo Date: Thu, 9 Dec 2021 00:00:00 +0000 Subject: Check EXWM terminal instead of client or graphical frames * exwm-core.el (exwm--terminal-p): Add function. * exwm.el (exwm--confirm-kill-terminal): Use it. * exwm-input.el (exwm-input--on-buffer-list-update): Use it. (exwm-input--on-minibuffer-setup) (exwm-input--on-minibuffer-exit): Use it. (exwm-input--on-minibuffer-exit): Use the minibuffer's selected window's frame or selected frame instead of current workspace. (exwm-input--on-echo-area-dirty): Removed test, as it's checked in `exwm-input--on-minibuffer-setup'. * exwm-layout.el (exwm-layout--on-minibuffer-setup) (exwm-layout--on-echo-area-change): Use it. (exwm-layout--on-echo-area-change): Refresh layout the frame of selected window's minibuffer if it's an EXWM frame. * exwm-workspace.el (exwm-workspace--update-minibuffer-height) (exwm-workspace--on-minibuffer-setup) (exwm-workspace--on-minibuffer-exit) (exwm-workspace--on-echo-area-dirty) (exwm-workspace--on-echo-area-clear) (exwm-workspace--on-delete-frame): Use it. * exwm-workspace.el (exwm-workspace--client-p-hash-table): Remove variable. (exwm-workspace--client-p): Remove function. --- exwm.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'exwm.el') diff --git a/exwm.el b/exwm.el index 8a85002c4c27..ecce55c5968c 100644 --- a/exwm.el +++ b/exwm.el @@ -995,7 +995,7 @@ manager. If t, replace it, if nil, abort and ask the user if `ask'." "Confirm before killing terminal." ;; This is invoked instead of `save-buffers-kill-emacs' (C-x C-c) on client ;; frames. - (if (eq (frame-terminal) exwm--terminal) + (if (exwm--terminal-p) (exwm--confirm-kill-emacs "[EXWM] Kill terminal?") t)) -- cgit 1.4.1