Stop vc from burying buffers sometimes

* vc/vc-dispatcher.el (vc-resynch-window): Tell view-mode not to
change window configuration when we turn it off.

2 files changed, 7 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6246227313c..f066327c9b9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-21  Daniel Colascione  <dancol@dancol.org>
+
+        * vc/vc-dispatcher.el (vc-resynch-window): Tell view-mode not to
+        change window configuration when we turn it off.
+
 2014-10-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         Get rid of backend-dependent selection-handling functions for kill/yank
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index 4fd9691d2a2..d2125d57ba4 100644
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -429,7 +429,7 @@ If the current buffer is a Dired buffer, revert it."
 ;; even if the dispatcher client mode has messed with file contents (as in,
 ;; for example, VCS keyword expansion).
 
-(declare-function view-mode-exit "view" (&optional return-to-alist exit-action all-win))
+(declare-function view-mode-exit "view" (&optional exit-only exit-action all-win))
 
 (defun vc-position-context (posn)
   "Save a bit of the text around POSN in the current buffer.
@@ -543,7 +543,7 @@ editing!"
                   (if (file-writable-p file)
                       (and view-mode
                            (let ((view-old-buffer-read-only nil))
-                             (view-mode-exit)))
+                             (view-mode-exit t)))
                     (and (not view-mode)
                          (not (eq (get major-mode 'mode-class) 'special))
                          (view-mode-enter))))