mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-14 16:50:58 +00:00
(kill-buffer-and-window): Remove `yes-or-no-p' so that
the function is less noisy. Now only `kill-buffer' can ask questions.
This commit is contained in:
parent
f87ef6b12d
commit
0f790c74e1
@ -532,11 +532,18 @@ Return non-nil if the window was shrunk."
|
||||
(defun kill-buffer-and-window ()
|
||||
"Kill the current buffer and delete the selected window."
|
||||
(interactive)
|
||||
(if (yes-or-no-p (format "Kill buffer `%s'? " (buffer-name)))
|
||||
(let ((buffer (current-buffer)))
|
||||
(delete-window (selected-window))
|
||||
(kill-buffer buffer))
|
||||
(error "Aborted")))
|
||||
(let ((window-to-delete (selected-window))
|
||||
(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))))
|
||||
|
||||
(defun quit-window (&optional kill window)
|
||||
"Quit the current buffer. Bury it, and maybe delete the selected frame.
|
||||
|
Loading…
Reference in New Issue
Block a user