[Emacs-diffs] Changes to emacs/lisp/window.el

[Richard M. Stallman]

Index: emacs/lisp/window.el
diff -c emacs/lisp/window.el:1.90 emacs/lisp/window.el:1.91
*** emacs/lisp/window.el:1.90   Mon Sep  1 11:45:18 2003
--- emacs/lisp/window.el        Thu Sep 11 20:52:08 2003
***************
*** 532,542 ****
  (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")))
  
  (defun quit-window (&optional kill window)
    "Quit the current buffer.  Bury it, and maybe delete the selected frame.
--- 532,549 ----
  (defun kill-buffer-and-window ()
    "Kill the current buffer and delete the selected window."
    (interactive)
!   (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.