mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
* 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
Download patch file Download diff file Expand all files Collapse all files

6
lisp/vc/vc.el
View file

@ -2302,8 +2302,7 @@ to the working revision (except for keyword expansion)."
(if (= nfiles 1) "" "s"))))))
(error "Revert canceled")))
(when diff-buffer
(delete-windows-on diff-buffer)
(kill-buffer diff-buffer)))
(quit-windows-on diff-buffer t)))
(dolist (file files)
(message "Reverting %s..." (vc-delistify files))
(vc-revert-file file)
@ -2349,8 +2348,7 @@ depending on the underlying version-control system."
;; Display changes
(unless (yes-or-no-p "Discard these revisions? ")
(error "Rollback canceled"))
(delete-windows-on "*vc-diff*")
(kill-buffer"*vc-diff*")
(quit-windows-on "*vc-diff*" t)
;; Do the actual reversions
(message "Rolling back %s..." (vc-delistify files))
(with-vc-properties