summaryrefslogtreecommitdiff
path: root/lisp/vc
diff options
context:
space:
mode:
authorAaron S. Hawley <aaron.s.hawley@gmail.com>2012-05-29 19:41:45 +0800
committerChong Yidong <cyd@gnu.org>2012-05-29 19:41:45 +0800
commit2b311310c35f1a75a9dfc77fc393c97320accdd9 (patch)
treeecd0fb12e0f6f8a2d8dd77e4265de34b9181663d /lisp/vc
parentb9cb23871ed93899ebf5bed94a37c3157b1456e0 (diff)
downloademacs-2b311310c35f1a75a9dfc77fc393c97320accdd9.tar.gz
* vc.el (vc-revert, vc-rollback): Dont kill vc-diff buffer on revert.
Fixes: debbugs:11488
Diffstat (limited to 'lisp/vc')
-rw-r--r--lisp/vc/vc.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index ad828d6f78f..87e4e1c5124 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -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