From: Daniel Colascione <dancol@dancol.org>
Date: Tue, 21 Oct 2014 16:05:13 +0000 (+0100)
Subject: Stop vc from burying buffers sometimes
X-Git-Tag: emacs-25.0.90~2635^2~679
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=be5722e930b71fbbca049bd924b0b2f6dafa72b4;p=emacs.git

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.
---

be5722e930b71fbbca049bd924b0b2f6dafa72b4
diff --cc lisp/ChangeLog
index 6246227313c,4608ed3aabe..f066327c9b9
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,67 -1,3 +1,72 @@@
++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
 +	and make it generic instead by relying on the lower-level selection
 +	management functions.
 +
 +	* select.el (select-enable-clipboard): Rename from
 +	gui-select-enable-clipboard.
 +	(select-enable-primary): Move from x-win.el and rename from
 +	x-select-enable-primary.
 +	(gui-last-selected-text): Remove.
 +	(gui--last-selected-text-clipboard, gui--last-selected-text-primary):
 +	New vars.
 +	(gui-select-text): Rewrite, based on x-win.el's old x-select-text.
 +	(gui-select-text-alist, gui-selection-value-alist): Remove.
 +	(x-select-request-type): Move from x-win.el.
 +	(gui--selection-value-internal): New function, taken from x-win's
 +	x-selection-value-internal.
 +	(gui-selection-value): Rewrite, based on x-win.el's old x-selection-value.
 +	(gui-set-selection-alist): Rename from gui-own-selection-alist and
 +	extend it to handle a nil value as a "disown" request.
 +	(gui-disown-selection-alist): Remove.
 +	(xselect-convert-to-delete): Adjust accordingly.
 +	(gui-set-selection): Simplify accordingly as well.  Use dotimes.
 +
 +	* term/x-win.el (x-last-selected-text-primary)
 +	(x-select-enable-primary): Remove (moved to select.el).
 +	(x-select-request-type): Move to select.el.
 +	(x-selection-value-internal, x--selection-value): Remove functions.
 +	(gui-selection-value, gui-select-text): Remove moethods.
 +	(gui-set-selection): Merge own and disown methods.
 +
 +	* term/w32-win.el (w32--select-text, w32--get-selection-value):
 +	Delete function (move functionality into w32--set-selection and
 +	w32--get-selection).
 +	(gui-select-text, gui-selection-value): Don't define methods.
 +	(w32--set-selection, w32--get-selection, w32--selection-owner-p):
 +	New functions.
 +	(gui-get-selection, gui-selection-owner-p, gui-selection-exists-p):
 +	Use them.
 +	(gui-selection-exists-p): Adjust to new name of C primitive.
 +
 +	* term/pc-win.el (w16-get-selection-value): Add dummy argument and drop
 +	test of gui-select-enable-clipboard, to make it usable as
 +	a gui-get-selection method.
 +	(gui-selection-exists-p): Adjust to new name of C primitive.
 +	(gui-set-selection): Merge own and disown methods.
 +	(gui-select-text, gui-selection-value): Delete methods.
 +	(w16--select-text): Delete function.
 +
 +	* term/ns-win.el (ns-get-pasteboard, ns-set-pasteboard)
 +	(ns-selection-value): Remove functions.
 +	(gui-select-text, gui-selection-value): Don't define method any more.
 +	(gui-set-selection): Merge the old own and disown methods.
 +	(gui-selection-exists-p, gui-get-selection): Adjust to new name of
 +	underlying C primitive.
 +
 +	* startup.el (command-line): Adjust now that `gui-method' expects nil
 +	for ttys.
 +
 +	* frame.el (gui-method): Use window-system rather than framep.
 +	(gui-method-declare): The tty case is now nil rather than t.
 +	(make-frame): Adjust accordingly.
 +
  2014-10-21  Stefan Monnier  <monnier@iro.umontreal.ca>
  
  	* net/newst-reader.el (newsticker--image-read): Simplify.
diff --cc lisp/vc/vc-dispatcher.el
index 4fd9691d2a2,4fd9691d2a2..d2125d57ba4
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@@ -429,7 -429,7 +429,7 @@@ If the current buffer is a Dired buffer
  ;; 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 +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))))