Fix for "Selecting deleted buffer" exception

This commit is contained in:
Ram Krishnan 2017-10-25 20:50:25 -07:00
parent 3edf2e8880
commit 93d96757b6

View file

@ -405,21 +405,13 @@ manager is shutting down."
(xcb:flush exwm--connection)) (xcb:flush exwm--connection))
(let ((kill-buffer-func (let ((kill-buffer-func
(lambda (buffer) (lambda (buffer)
(with-current-buffer buffer (let ((kill-buffer-query-functions nil))
(let ((kill-buffer-query-functions nil) (when exwm--floating-frame
(floating exwm--floating-frame))
(kill-buffer)
(when floating
(select-window (select-window
(frame-selected-window exwm-workspace--current)))))))) (frame-selected-window exwm-workspace--current)))
(if (not (active-minibuffer-window)) (kill-buffer buffer)))))
;; 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) (run-with-idle-timer 0 nil kill-buffer-func buffer)
(when (active-minibuffer-window)
(exit-minibuffer)))))) (exit-minibuffer))))))
(defun exwm-manage--scan () (defun exwm-manage--scan ()