aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2010-08-05 21:01:00 -0700
committerDan Nicolaescu2010-08-05 21:01:00 -0700
commitb3d42406f854852f3ca4a45112c8cd182279a23b (patch)
tree77f48fd4972158eeacfbbc529e1c91ca4bf03e61
parentcbfb9427737c02f3238e8e131dd062dd6bca796f (diff)
downloademacs-b3d42406f854852f3ca4a45112c8cd182279a23b.tar.gz
emacs-b3d42406f854852f3ca4a45112c8cd182279a23b.zip
* lisp/vc/diff-mode.el (diff-mode-shared-map): Bind g to revert-buffer.
-rw-r--r--etc/NEWS3
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc/diff-mode.el1
3 files changed, 8 insertions, 0 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 570fba192c7..37d105995bb 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -258,6 +258,9 @@ is just left as is in the message, so it is not lost.
258**** vc-bzr handles Author:, Date: and Fixes: 258**** vc-bzr handles Author:, Date: and Fixes:
259**** vc-mtn handles Author: and Date: 259**** vc-mtn handles Author: and Date:
260 260
261*** Pressing g in a *vc-diff* buffer reruns vc-diff, so it will
262produce an up to date diff.
263
261** Directory local variables can apply to file-less buffers. 264** Directory local variables can apply to file-less buffers.
262For example, adding "(diff-mode . ((mode . whitespace)))" to your 265For example, adding "(diff-mode . ((mode . whitespace)))" to your
263.dir-locals.el file, will turn on `whitespace-mode' for *vc-diff* buffers. 266.dir-locals.el file, will turn on `whitespace-mode' for *vc-diff* buffers.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9ab754afe62..4e09f857af0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12010-08-06 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * vc/diff-mode.el (diff-mode-shared-map): Bind g to revert-buffer.
4
12010-08-05 Eli Zaretskii <eliz@gnu.org> 52010-08-05 Eli Zaretskii <eliz@gnu.org>
2 6
3 * emacs-lisp/find-gc.el (find-gc-source-files): Rename 7 * emacs-lisp/find-gc.el (find-gc-source-files): Rename
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 0ef9d06c3b2..cec4fb24616 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -141,6 +141,7 @@ when editing big diffs)."
141 ;; Standard M-r is useful, so don't change M-r or M-R. 141 ;; Standard M-r is useful, so don't change M-r or M-R.
142 ;;("r" . diff-restrict-view) 142 ;;("r" . diff-restrict-view)
143 ;;("R" . diff-reverse-direction) 143 ;;("R" . diff-reverse-direction)
144 ("g" . revert-buffer)
144 ("q" . quit-window)) 145 ("q" . quit-window))
145 "Basic keymap for `diff-mode', bound to various prefix keys.") 146 "Basic keymap for `diff-mode', bound to various prefix keys.")
146 147