diff options
Diffstat (limited to 'lisp/vc/vc-dispatcher.el')
| -rw-r--r-- | lisp/vc/vc-dispatcher.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el index 4fd9691d2a2..e1bf05c8916 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)))) @@ -702,7 +702,7 @@ the buffer contents as a comment." ;; Now make sure we see the expanded headers (when log-fileset (mapc - (lambda (file) (vc-resynch-buffer file vc-keep-workfiles t)) + (lambda (file) (vc-resynch-buffer file t t)) log-fileset)) (when (vc-dispatcher-browsing) (vc-dir-move-to-goal-column)) |