[Emacs-diffs] trunk r118174: Stop vc from burying buffers sometimes

[Daniel Colascione]

------------------------------------------------------------
revno: 118174 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Daniel Colascione <address@hidden>
branch nick: trunk
timestamp: Tue 2014-10-21 17:05:13 +0100
message:
  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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/vc/vc-dispatcher.el       
vcdispatcher.el-20091113204419-o5vbwnq5f7feedwu-8662

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-10-21 15:27:18 +0000
+++ b/lisp/ChangeLog    2014-10-21 16:05:13 +0000
@@ -1,3 +1,8 @@
+2014-10-21  Daniel Colascione  <address@hidden>
+
+       * 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  <address@hidden>
 
        Get rid of backend-dependent selection-handling functions for kill/yank

=== modified file 'lisp/vc/vc-dispatcher.el'
--- a/lisp/vc/vc-dispatcher.el  2014-07-14 19:29:29 +0000
+++ b/lisp/vc/vc-dispatcher.el  2014-10-21 16:03:04 +0000
@@ -429,7 +429,7 @@
 ;; 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 @@
                   (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))))