From d052d3bdf357c710b2885d6acb77194726705937 Mon Sep 17 00:00:00 2001 From: Xue Fuqiao Date: Sat, 21 Sep 2013 16:16:13 +0800 Subject: [PATCH] Add keybinding for vc-log-incoming in vc-dir. * doc/emacs/maintaining.texi (VC Directory Commands): Add keybinding for vc-log-incoming in vc-dir. * lisp/vc/vc-dir.el (vc-dir-mode-map): Add keybinding for vc-log-incoming. --- doc/emacs/ChangeLog | 5 +++++ doc/emacs/maintaining.texi | 2 +- etc/NEWS | 3 +++ lisp/ChangeLog | 4 ++++ lisp/vc/vc-dir.el | 1 + lisp/vc/vc.el | 2 +- 6 files changed, 15 insertions(+), 2 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index b263ca7671a..1fddd4ab180 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,8 @@ +2013-09-21 Xue Fuqiao + + * maintaining.texi (VC Directory Commands): Add keybinding for + vc-log-incoming in vc-dir. + 2013-09-12 Xue Fuqiao * text.texi (Enriched Justification): Explain values of default-justification. diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 4a61db5509b..9cb6c70e0fb 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -1242,7 +1242,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}, @kbd{D}, @kbd{L}, @kbd{G} and @kbd{v}. +@kbd{i}, @kbd{D}, @kbd{L}, @kbd{G}, @kbd{I} 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 736bf8f14e6..1cb8d53b57f 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -275,6 +275,9 @@ whole tree revisions. *** In VC directory mode, `L' lists the change log for the current VC controlled tree in a window. +*** In VC directory mode, `I' shows a log of changes that will be +received with a pull operation. + *** `C-x v G' (globally) and `G' (in VC directory mode) ignores a file under current version control system. When called with a prefix argument, you can remove a file from the ignored file list. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 75aea560203..7e8f9655460 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2013-09-21 Xue Fuqiao + + * vc/vc-dir.el (vc-dir-mode-map): Add keybinding for vc-log-incoming. + 2013-09-20 Stefan Monnier * subr.el (internal--call-interactively): New const. diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el index 5ddcfd57748..1e6ec15174a 100644 --- a/lisp/vc/vc-dir.el +++ b/lisp/vc/vc-dir.el @@ -245,6 +245,7 @@ See `run-hooks'." (define-key map "+" 'vc-update) ;; C-x v + (define-key map "l" 'vc-print-log) ;; C-x v l (define-key map "L" 'vc-print-root-log) ;; C-x v L + (define-key map "I" 'vc-log-incoming) ;; C-x v I ;; More confusing than helpful, probably ;;(define-key map "R" 'vc-revert) ;; u is taken by vc-dir-unmark. ;;(define-key map "A" 'vc-annotate) ;; g is taken by revert-buffer diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index fa5c87d44e3..69098efc50b 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -2336,7 +2336,7 @@ When called interactively with a prefix argument, prompt for LIMIT." ;;;###autoload (defun vc-log-incoming (&optional remote-location) "Show a log of changes that will be received with a pull operation from REMOTE-LOCATION. -When called interactively with a prefix argument, prompt for REMOTE-LOCATION.." +When called interactively with a prefix argument, prompt for REMOTE-LOCATION." (interactive (when current-prefix-arg (list (read-string "Remote location (empty for default): ")))) -- 2.39.2