diff options
| author | Xue Fuqiao | 2013-09-21 16:16:13 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-09-21 16:16:13 +0800 |
| commit | d052d3bdf357c710b2885d6acb77194726705937 (patch) | |
| tree | 6e0c6f937691cd8d6c354bd5e4ce8978dbd66a06 | |
| parent | 26d078a69e2251efc65d1a25c3f59ceca50de87d (diff) | |
| download | emacs-d052d3bdf357c710b2885d6acb77194726705937.tar.gz emacs-d052d3bdf357c710b2885d6acb77194726705937.zip | |
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.
| -rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/maintaining.texi | 2 | ||||
| -rw-r--r-- | etc/NEWS | 3 | ||||
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/vc/vc-dir.el | 1 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2013-09-21 Xue Fuqiao <xfq.free@gmail.com> | ||
| 2 | |||
| 3 | * maintaining.texi (VC Directory Commands): Add keybinding for | ||
| 4 | vc-log-incoming in vc-dir. | ||
| 5 | |||
| 1 | 2013-09-12 Xue Fuqiao <xfq.free@gmail.com> | 6 | 2013-09-12 Xue Fuqiao <xfq.free@gmail.com> |
| 2 | 7 | ||
| 3 | * text.texi (Enriched Justification): Explain values of default-justification. | 8 | * 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}). | |||
| 1242 | 1242 | ||
| 1243 | The VC Directory buffer also defines some single-key shortcuts for | 1243 | The VC Directory buffer also defines some single-key shortcuts for |
| 1244 | VC commands with the @kbd{C-x v} prefix: @kbd{=}, @kbd{+}, @kbd{l}, | 1244 | VC commands with the @kbd{C-x v} prefix: @kbd{=}, @kbd{+}, @kbd{l}, |
| 1245 | @kbd{i}, @kbd{D}, @kbd{L}, @kbd{G} and @kbd{v}. | 1245 | @kbd{i}, @kbd{D}, @kbd{L}, @kbd{G}, @kbd{I} and @kbd{v}. |
| 1246 | 1246 | ||
| 1247 | For example, you can commit a set of edited files by opening a VC | 1247 | For example, you can commit a set of edited files by opening a VC |
| 1248 | Directory buffer, where the files are listed with the @samp{edited} | 1248 | Directory buffer, where the files are listed with the @samp{edited} |
| @@ -275,6 +275,9 @@ whole tree revisions. | |||
| 275 | *** In VC directory mode, `L' lists the change log for the current VC | 275 | *** In VC directory mode, `L' lists the change log for the current VC |
| 276 | controlled tree in a window. | 276 | controlled tree in a window. |
| 277 | 277 | ||
| 278 | *** In VC directory mode, `I' shows a log of changes that will be | ||
| 279 | received with a pull operation. | ||
| 280 | |||
| 278 | *** `C-x v G' (globally) and `G' (in VC directory mode) ignores a file | 281 | *** `C-x v G' (globally) and `G' (in VC directory mode) ignores a file |
| 279 | under current version control system. When called with a prefix | 282 | under current version control system. When called with a prefix |
| 280 | argument, you can remove a file from the ignored file list. | 283 | 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 @@ | |||
| 1 | 2013-09-21 Xue Fuqiao <xfq.free@gmail.com> | ||
| 2 | |||
| 3 | * vc/vc-dir.el (vc-dir-mode-map): Add keybinding for vc-log-incoming. | ||
| 4 | |||
| 1 | 2013-09-20 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2013-09-20 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * subr.el (internal--call-interactively): New const. | 7 | * 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'." | |||
| 245 | (define-key map "+" 'vc-update) ;; C-x v + | 245 | (define-key map "+" 'vc-update) ;; C-x v + |
| 246 | (define-key map "l" 'vc-print-log) ;; C-x v l | 246 | (define-key map "l" 'vc-print-log) ;; C-x v l |
| 247 | (define-key map "L" 'vc-print-root-log) ;; C-x v L | 247 | (define-key map "L" 'vc-print-root-log) ;; C-x v L |
| 248 | (define-key map "I" 'vc-log-incoming) ;; C-x v I | ||
| 248 | ;; More confusing than helpful, probably | 249 | ;; More confusing than helpful, probably |
| 249 | ;;(define-key map "R" 'vc-revert) ;; u is taken by vc-dir-unmark. | 250 | ;;(define-key map "R" 'vc-revert) ;; u is taken by vc-dir-unmark. |
| 250 | ;;(define-key map "A" 'vc-annotate) ;; g is taken by revert-buffer | 251 | ;;(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." | |||
| 2336 | ;;;###autoload | 2336 | ;;;###autoload |
| 2337 | (defun vc-log-incoming (&optional remote-location) | 2337 | (defun vc-log-incoming (&optional remote-location) |
| 2338 | "Show a log of changes that will be received with a pull operation from REMOTE-LOCATION. | 2338 | "Show a log of changes that will be received with a pull operation from REMOTE-LOCATION. |
| 2339 | When called interactively with a prefix argument, prompt for REMOTE-LOCATION.." | 2339 | When called interactively with a prefix argument, prompt for REMOTE-LOCATION." |
| 2340 | (interactive | 2340 | (interactive |
| 2341 | (when current-prefix-arg | 2341 | (when current-prefix-arg |
| 2342 | (list (read-string "Remote location (empty for default): ")))) | 2342 | (list (read-string "Remote location (empty for default): ")))) |