* 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 9c72bc6dd178c7eef934031021c785a3cedfef14..03acd7edafa2079bd2b4673b7bf999359ebe652e 100644 (file)
--- 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 ad828d6f78f86d69d385ab2764713f0723d043ee..87e4e1c51249a85f0f08d66cee7acd26a194f291 100644 (file)
--- 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