From 589b84040980504f0de7d80771b4ccfd63af4eef Mon Sep 17 00:00:00 2001 From: Chris Feng Date: Fri, 24 Nov 2017 22:43:16 +0800 Subject: [PATCH] Fix possible wrong context when killing buffers * exwm-manage.el (exwm-manage--unmanage-window): Make sure to use the correct context to read/set buffer-local variables when killing buffers. --- exwm-manage.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/exwm-manage.el b/exwm-manage.el index 2b9647563..d61a55a58 100644 --- a/exwm-manage.el +++ b/exwm-manage.el @@ -405,11 +405,12 @@ manager is shutting down." (xcb:flush exwm--connection)) (let ((kill-buffer-func (lambda (buffer) - (let ((kill-buffer-query-functions nil)) - (when exwm--floating-frame - (select-window - (frame-selected-window exwm-workspace--current))) - (kill-buffer buffer))))) + (when (buffer-local-value 'exwm--floating-frame buffer) + (select-window + (frame-selected-window exwm-workspace--current))) + (with-current-buffer buffer + (let ((kill-buffer-query-functions nil)) + (kill-buffer buffer)))))) (exwm--defer 0 kill-buffer-func buffer) (when (active-minibuffer-window) (exit-minibuffer))))))