From f5da083ed9884178b88bf2ee81486e4527d0da81 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Fri, 20 Oct 2006 15:12:31 +0000 Subject: [PATCH] (kill-buffer-and-window): Fix a bug where an aborted operation would still cause some window to collapse later. --- lisp/ChangeLog | 7 ++++++- lisp/window.el | 22 +++++++++++++++------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 44439658b56..e40671e1d99 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-10-20 David Kastrup + + * window.el (kill-buffer-and-window): Fix a bug where an aborted + operation would still cause some window to collapse later. + 2006-10-20 Stefan Monnier * vc.el (vc-switch-backend): Try to be more careful with unwanted @@ -574,7 +579,7 @@ * autoinsert.el (auto-insert-alist): Doc fix. -2006-10-07 Johan Bockg,be(Brd +2006-10-07 Johan Bockg,Ae(Brd * mouse-sel.el (mouse-insert-selection-internal): Use insert-for-yank, so that yank handlers are run. diff --git a/lisp/window.el b/lisp/window.el index 0c50bc63a08..ac4fc0b7c96 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -719,17 +719,25 @@ or if the window is the only window of its frame." "Kill the current buffer and delete the selected window." (interactive) (let ((window-to-delete (selected-window)) + (buffer-to-kill (current-buffer)) (delete-window-hook (lambda () (condition-case nil (delete-window) (error nil))))) - (add-hook 'kill-buffer-hook delete-window-hook t t) - (if (kill-buffer (current-buffer)) - ;; If `delete-window' failed before, we rerun it to regenerate - ;; the error so it can be seen in the minibuffer. - (when (eq (selected-window) window-to-delete) - (delete-window)) - (remove-hook 'kill-buffer-hook delete-window-hook t)))) + (unwind-protect + (progn + (add-hook 'kill-buffer-hook delete-window-hook t t) + (if (kill-buffer (current-buffer)) + ;; If `delete-window' failed before, we rerun it to regenerate + ;; the error so it can be seen in the echo area. + (when (eq (selected-window) window-to-delete) + (delete-window)))) + ;; If the buffer is not dead for some reason (probably because + ;; of a `quit' signal), remove the hook again. + (condition-case nil + (with-current-buffer buffer-to-kill + (remove-hook 'kill-buffer-hook delete-window-hook t)) + (error nil))))) (defun quit-window (&optional kill window) "Quit the current buffer. Bury it, and maybe delete the selected frame. -- 2.39.5