Exit the active minibuffer on unmanaging X windows
* exwm-manage.el (exwm-manage--unmanage-window): Exit the minibuffer as a precaution to prevent the "selecting deleted buffer" error.
This commit is contained in:
parent
ba0f41db1b
commit
aa7de9dc6f
1 changed files with 20 additions and 8 deletions
|
@ -352,14 +352,26 @@ manager is shutting down."
|
||||||
;; Destroy the X window container (and the frame container if any).
|
;; Destroy the X window container (and the frame container if any).
|
||||||
(xcb:+request exwm--connection
|
(xcb:+request exwm--connection
|
||||||
(make-instance 'xcb:DestroyWindow :window exwm--container))
|
(make-instance 'xcb:DestroyWindow :window exwm--container))
|
||||||
(let ((kill-buffer-query-functions nil)
|
(exwm-manage--set-client-list)
|
||||||
(floating exwm--floating-frame))
|
(xcb:flush exwm--connection))
|
||||||
(kill-buffer)
|
(let ((kill-buffer-func
|
||||||
(when floating
|
(lambda (buffer)
|
||||||
(select-window
|
(with-current-buffer buffer
|
||||||
(frame-selected-window exwm-workspace--current)))))
|
(let ((kill-buffer-query-functions nil)
|
||||||
(exwm-manage--set-client-list)
|
(floating exwm--floating-frame))
|
||||||
(xcb:flush exwm--connection))))
|
(kill-buffer)
|
||||||
|
(when floating
|
||||||
|
(select-window
|
||||||
|
(frame-selected-window exwm-workspace--current))))))))
|
||||||
|
(if (not (active-minibuffer-window))
|
||||||
|
;; Kill the buffer as usual.
|
||||||
|
(funcall kill-buffer-func buffer)
|
||||||
|
;; This can happen when this buffer was requested to be killed
|
||||||
|
;; from the minibuffer (e.g. with `ido-kill-buffer-at-head').
|
||||||
|
;; We have to exit the minibuffer first or there'll be a
|
||||||
|
;; "selecting deleted buffer" error.
|
||||||
|
(run-with-idle-timer 0 nil kill-buffer-func buffer)
|
||||||
|
(exit-minibuffer))))))
|
||||||
|
|
||||||
(defun exwm-manage--scan ()
|
(defun exwm-manage--scan ()
|
||||||
"Search for existing windows and try to manage them."
|
"Search for existing windows and try to manage them."
|
||||||
|
|
Loading…
Reference in a new issue