aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorChong Yidong2011-06-26 00:05:39 -0400
committerChong Yidong2011-06-26 00:05:39 -0400
commit2afef60a03c32cd6a9db697f12d6284b2b41415a (patch)
tree4aa579ee89fca6ec9eca71d31e66128effb1f274 /etc
parent5fdd4046b937d06b695fb8794ec1cdeb46bdfd8f (diff)
downloademacs-2afef60a03c32cd6a9db697f12d6284b2b41415a.tar.gz
emacs-2afef60a03c32cd6a9db697f12d6284b2b41415a.zip
New option for showing a diff in vc-revert (Bug#8927).
* vc/vc.el (vc-revert-show-diff): New defcustom. (vc-diff-internal): New arg specifying diff buffer. (vc-revert): Obey vc-revert-show-diff. If we show a diff, don't reuse an existing *vc-diff* buffer.
Diffstat (limited to 'etc')
-rw-r--r--etc/NEWS3
1 files changed, 3 insertions, 0 deletions
diff --git a/etc/NEWS b/etc/NEWS
index ac9a49af864..5fcd8927cf1 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -787,6 +787,9 @@ the user for specifics, e.g. a merge source.
787 787
788**** Currently supported for Bzr, Git, and Mercurial. 788**** Currently supported for Bzr, Git, and Mercurial.
789 789
790*** New option `vc-revert-show-diff' controls whether `vc-revert'
791shows a diff while querying the user. It defaults to nil.
792
790*** Log entries in some Log View buffers can be toggled to display a 793*** Log entries in some Log View buffers can be toggled to display a
791longer description by typing RET (log-view-toggle-entry-display). 794longer description by typing RET (log-view-toggle-entry-display).
792In the Log View buffers made by `C-x v L' (vc-print-root-log), you can 795In the Log View buffers made by `C-x v L' (vc-print-root-log), you can