Commit be5722e9 authored by Daniel Colascione's avatar Daniel Colascione
Browse files

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.
parents a046b8dd 80aabe42
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
......
......@@ -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))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment