From: Aaron S. Hawley <aaron.s.hawley@gmail.com>
Date: Tue, 29 May 2012 11:41:45 +0000 (+0800)
Subject: * vc.el (vc-revert, vc-rollback): Dont kill vc-diff buffer on revert.
X-Git-Tag: emacs-24.2.90~471^2~6^2~58
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2b311310c35f1a75a9dfc77fc393c97320accdd9;p=emacs.git

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

Fixes: debbugs:11488
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9c72bc6dd17..03acd7edafa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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
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