1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00

In vc actions use quit-windows-on instead of delete-windows-on.

* window.el (quit-windows-on): New function.
* vc/vc.el (vc-revert, vc-rollback):
* vc/vc-dispatcher.el (vc-finish-logentry): Call quit-windows-on
instead of deleting windows.  (Bug#4557) (Bug#5310) (Bug#5556)
(Bug#6183) (Bug#7074)((Bug#7447)
This commit is contained in:
Martin Rudalics 2011-10-10 19:52:03 +02:00
parent 0563dae9a9
commit 366ca7f3da
4 changed files with 38 additions and 16 deletions

View file

@ -666,18 +666,15 @@ the buffer contents as a comment."
(funcall log-operation
log-fileset
log-entry))
;; Remove checkin window (after the checkin so that if that fails
;; we don't zap the log buffer and the typing therein).
;; -- IMO this should be replaced with quit-window
(cond ((and logbuf vc-delete-logbuf-window)
(delete-windows-on logbuf (selected-frame))
;; Kill buffer and delete any other dedicated windows/frames.
(kill-buffer logbuf))
(logbuf
(with-selected-window (or (get-buffer-window logbuf 0)
(selected-window))
(with-current-buffer logbuf
(bury-buffer)))))
;; Quit windows on logbuf.
(cond
((not logbuf))
(vc-delete-logbuf-window
(quit-windows-on logbuf t (selected-frame)))
(t
(quit-windows-on logbuf nil 0)))
;; Now make sure we see the expanded headers
(when log-fileset
(mapc