[Emacs-diffs] /srv/bzr/emacs/trunk r108418: * vc.el (vc-revert, vc-rollback): Dont kill vc-diff buffer on revert.

[Chong Yidong]

------------------------------------------------------------
revno: 108418
fixes bug: http://debbugs.gnu.org/11488
author: Aaron S. Hawley <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2012-05-29 19:41:45 +0800
message:
  * vc.el (vc-revert, vc-rollback): Dont kill vc-diff buffer on revert.
modified:
  lisp/ChangeLog
  lisp/vc/vc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-29 09:46:06 +0000
+++ b/lisp/ChangeLog    2012-05-29 11:41:45 +0000
@@ -1,3 +1,8 @@
+2012-05-29  Aaron S. Hawley  <address@hidden>
+
+       * vc/vc.el (vc-revert, vc-rollback): Dont kill vc-diff buffer on
+       revert (Bug#11488).
+
 2012-05-29  Juri Linkov  <address@hidden>
 
        * isearch.el (isearch-mode-map): Bind `M-s _' to

=== modified file 'lisp/vc/vc.el'
--- a/lisp/vc/vc.el     2012-04-26 03:18:47 +0000
+++ b/lisp/vc/vc.el     2012-05-29 11:41:45 +0000
@@ -2285,7 +2285,7 @@
                                       (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 @@
     ;; 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