From e4c467f919b37ccb56f44a49571565741d49a0db Mon Sep 17 00:00:00 2001 From: Xue Fuqiao Date: Sat, 27 Jul 2013 08:09:51 +0800 Subject: [PATCH] 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. --- doc/emacs/ChangeLog | 4 ++++ doc/emacs/maintaining.texi | 2 +- etc/NEWS | 5 +++++ lisp/ChangeLog | 4 ++++ lisp/vc/vc-dir.el | 1 + 5 files changed, 15 insertions(+), 1 deletion(-) 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 @@ +2013-07-27 Xue Fuqiao + + * maintaining.texi (VC Directory Commands): Mention `D' and `L' in vc-dir. + 2013-07-26 Eli Zaretskii * 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}). The VC Directory buffer also defines some single-key shortcuts for VC commands with the @kbd{C-x v} prefix: @kbd{=}, @kbd{+}, @kbd{l}, -@kbd{i}, and @kbd{v}. +@kbd{i}, @kbd{D}, @kbd{L} and @kbd{v}. For example, you can commit a set of edited files by opening a VC Directory 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. *** New variable `diary-from-outlook-function', used by the command `diary-from-outlook'. +** VC Directory Mode + +*** `D' displays diffs between VC-controlled whole tree revisions. +*** `L' lists the change log for the current VC controlled tree in a window. + ** cl-lib *** 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 @@ +2013-07-26 Xue Fuqiao + + * vc/vc-dir.el (vc-dir-mode-map): Add binding for vc-root-diff. + 2013-07-26 Stefan Monnier * 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'." ;; VC commands (define-key map "v" 'vc-next-action) ;; C-x v v (define-key map "=" 'vc-diff) ;; C-x v = + (define-key map "D" 'vc-root-diff) ;; C-x v D (define-key map "i" 'vc-register) ;; C-x v i (define-key map "+" 'vc-update) ;; C-x v + (define-key map "l" 'vc-print-log) ;; C-x v l -- 2.39.2