Commit 2b311310 authored by Aaron S. Hawley's avatar Aaron S. Hawley Committed by Chong Yidong
Browse files

* vc.el (vc-revert, vc-rollback): Dont kill vc-diff buffer on revert.

Fixes: debbugs:11488
parent b9cb2387
2012-05-29 Aaron S. Hawley <aaron.s.hawley@gmail.com>
* vc/vc.el (vc-revert, vc-rollback): Dont kill vc-diff buffer on
revert (Bug#11488).
2012-05-29 Juri Linkov <juri@jurta.org>
* isearch.el (isearch-mode-map): Bind `M-s _' to
......
......@@ -2285,7 +2285,7 @@ to the working revision (except for keyword expansion)."
(if (= nfiles 1) "" "s"))))))
(error "Revert canceled")))
(when diff-buffer
(quit-windows-on diff-buffer t)))
(quit-windows-on diff-buffer)))
(dolist (file files)
(message "Reverting %s..." (vc-delistify files))
(vc-revert-file file)
......@@ -2331,7 +2331,7 @@ depending on the underlying version-control system."
;; Display changes
(unless (yes-or-no-p "Discard these revisions? ")
(error "Rollback canceled"))
(quit-windows-on "*vc-diff*" t)
(quit-windows-on "*vc-diff*")
;; Do the actual reversions
(message "Rolling back %s..." (vc-delistify files))
(with-vc-properties
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment