aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXue Fuqiao2013-07-27 08:09:51 +0800
committerXue Fuqiao2013-07-27 08:09:51 +0800
commite4c467f919b37ccb56f44a49571565741d49a0db (patch)
tree268e5d95ce6a0a66e6ab2115ff3a674603b072eb
parent13afd560a137730c2fd22b9ee664867f9d4e17d6 (diff)
downloademacs-e4c467f919b37ccb56f44a49571565741d49a0db.tar.gz
emacs-e4c467f919b37ccb56f44a49571565741d49a0db.zip
Keybinding fix for vc-dir.
* lisp/vc/vc-dir.el (vc-dir-mode-map): Add binding for vc-root-diff. * doc/emacs/maintaining.texi (VC Directory Commands): Mention `D' and `L' in vc-dir.
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/maintaining.texi2
-rw-r--r--etc/NEWS5
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc/vc-dir.el1
5 files changed, 15 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index ad2f091f27f..810dcac185c 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
12013-07-27 Xue Fuqiao <xfq.free@gmail.com>
2
3 * maintaining.texi (VC Directory Commands): Mention `D' and `L' in vc-dir.
4
12013-07-26 Eli Zaretskii <eliz@gnu.org> 52013-07-26 Eli Zaretskii <eliz@gnu.org>
2 6
3 * display.texi (Fringes): Document the variable fringe-mode. 7 * display.texi (Fringes): Document the variable fringe-mode.
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index e89660dfaf5..6184684fbb0 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -1222,7 +1222,7 @@ Revisions}), and @w{@kbd{C-x v u}} (@pxref{VC Undo}).
1222 1222
1223 The VC Directory buffer also defines some single-key shortcuts for 1223 The VC Directory buffer also defines some single-key shortcuts for
1224VC commands with the @kbd{C-x v} prefix: @kbd{=}, @kbd{+}, @kbd{l}, 1224VC commands with the @kbd{C-x v} prefix: @kbd{=}, @kbd{+}, @kbd{l},
1225@kbd{i}, and @kbd{v}. 1225@kbd{i}, @kbd{D}, @kbd{L} and @kbd{v}.
1226 1226
1227 For example, you can commit a set of edited files by opening a VC 1227 For example, you can commit a set of edited files by opening a VC
1228Directory buffer, where the files are listed with the @samp{edited} 1228Directory buffer, where the files are listed with the @samp{edited}
diff --git a/etc/NEWS b/etc/NEWS
index 6f645545f75..1aa374939d8 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -233,6 +233,11 @@ The default separator is changed to allow surrounding spaces around the comma.
233*** New variable `diary-from-outlook-function', used by the command 233*** New variable `diary-from-outlook-function', used by the command
234`diary-from-outlook'. 234`diary-from-outlook'.
235 235
236** VC Directory Mode
237
238*** `D' displays diffs between VC-controlled whole tree revisions.
239*** `L' lists the change log for the current VC controlled tree in a window.
240
236** cl-lib 241** cl-lib
237 242
238*** New macro cl-tagbody. 243*** New macro cl-tagbody.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 65bbc8a305b..ef409aa3005 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12013-07-26 Xue Fuqiao <xfq.free@gmail.com>
2
3 * vc/vc-dir.el (vc-dir-mode-map): Add binding for vc-root-diff.
4
12013-07-26 Stefan Monnier <monnier@iro.umontreal.ca> 52013-07-26 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * emacs-lisp/nadvice.el (advice--called-interactively-skip): Use the new 7 * emacs-lisp/nadvice.el (advice--called-interactively-skip): Use the new
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 325e66ea530..7df2bd6687d 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -237,6 +237,7 @@ See `run-hooks'."
237 ;; VC commands 237 ;; VC commands
238 (define-key map "v" 'vc-next-action) ;; C-x v v 238 (define-key map "v" 'vc-next-action) ;; C-x v v
239 (define-key map "=" 'vc-diff) ;; C-x v = 239 (define-key map "=" 'vc-diff) ;; C-x v =
240 (define-key map "D" 'vc-root-diff) ;; C-x v D
240 (define-key map "i" 'vc-register) ;; C-x v i 241 (define-key map "i" 'vc-register) ;; C-x v i
241 (define-key map "+" 'vc-update) ;; C-x v + 242 (define-key map "+" 'vc-update) ;; C-x v +
242 (define-key map "l" 'vc-print-log) ;; C-x v l 243 (define-key map "l" 'vc-print-log) ;; C-x v l