diff options
| author | Dan Nicolaescu | 2008-03-29 00:43:56 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-03-29 00:43:56 +0000 |
| commit | c6ea7ec62cc3d693865fd3756c7b13caf326d25b (patch) | |
| tree | ddd85bcf3aa31ab436bfdaa9beec2271e6e81218 | |
| parent | 20f95df2107fde0ff7252c9c44d4c50cde324ad7 (diff) | |
| download | emacs-c6ea7ec62cc3d693865fd3756c7b13caf326d25b.tar.gz emacs-c6ea7ec62cc3d693865fd3756c7b13caf326d25b.zip | |
(vc-status-mode-map, vc-status-menu-map): Bind vc-update and vc-print-log.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/vc.el | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2b44763bea3..ff82d8321c7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | * vc.el (vc-update): Check if the buffer is unsaved only if it | 3 | * vc.el (vc-update): Check if the buffer is unsaved only if it |
| 4 | actually exists. | 4 | actually exists. |
| 5 | (vc-status-mode-map, vc-status-menu-map): Bind vc-update. | 5 | (vc-status-mode-map, vc-status-menu-map): Bind vc-update and vc-print-log. |
| 6 | 6 | ||
| 7 | 2008-03-28 Magnus Henoch <mange@freemail.hu> | 7 | 2008-03-28 Magnus Henoch <mange@freemail.hu> |
| 8 | 8 | ||
diff --git a/lisp/vc.el b/lisp/vc.el index 8a707464a03..77924cbac21 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -617,7 +617,6 @@ | |||
| 617 | 617 | ||
| 618 | (eval-when-compile | 618 | (eval-when-compile |
| 619 | (require 'cl) | 619 | (require 'cl) |
| 620 | (require 'compile) | ||
| 621 | (require 'dired) ; for dired-map-over-marks macro | 620 | (require 'dired) ; for dired-map-over-marks macro |
| 622 | (require 'dired-aux)) ; for dired-kill-{line,tree} | 621 | (require 'dired-aux)) ; for dired-kill-{line,tree} |
| 623 | 622 | ||
| @@ -2753,10 +2752,9 @@ With prefix arg READ-SWITCHES, specify a value to override | |||
| 2753 | (define-key map [update] | 2752 | (define-key map [update] |
| 2754 | '(menu-item "Update" vc-update | 2753 | '(menu-item "Update" vc-update |
| 2755 | :help "Update the current fileset's files to their tip revisions")) | 2754 | :help "Update the current fileset's files to their tip revisions")) |
| 2756 | ;; vc-print-log uses the current buffer, not a file. | 2755 | (define-key map [log] |
| 2757 | ;; (define-key map [log] | 2756 | '(menu-item "Show history" vc-print-log |
| 2758 | ;; '(menu-item "Show history" vc-status-print-log | 2757 | :help "List the change log of the current file set in a window")) |
| 2759 | ;; :help "List the change log of the current file set in a window")) | ||
| 2760 | 2758 | ||
| 2761 | ;; Movement. | 2759 | ;; Movement. |
| 2762 | (define-key map [separator-movement] '("--")) | 2760 | (define-key map [separator-movement] '("--")) |
| @@ -2821,8 +2819,7 @@ With prefix arg READ-SWITCHES, specify a value to override | |||
| 2821 | (define-key map "+" 'vc-update) | 2819 | (define-key map "+" 'vc-update) |
| 2822 | ;; Can't be "g" (as in vc map), so "A" for "Annotate". | 2820 | ;; Can't be "g" (as in vc map), so "A" for "Annotate". |
| 2823 | (define-key map "A" 'vc-annotate) | 2821 | (define-key map "A" 'vc-annotate) |
| 2824 | ;; vc-print-log uses the current buffer, not a file. | 2822 | (define-key map "l" 'vc-print-log) |
| 2825 | ;; (define-key map "l" 'vc-status-print-log) | ||
| 2826 | ;; The remainder. | 2823 | ;; The remainder. |
| 2827 | (define-key map "f" 'vc-status-find-file) | 2824 | (define-key map "f" 'vc-status-find-file) |
| 2828 | (define-key map "\C-m" 'vc-status-find-file) | 2825 | (define-key map "\C-m" 'vc-status-find-file) |
| @@ -2966,7 +2963,7 @@ Throw an error if another update process is in progress." | |||
| 2966 | (error "Another update process is in progress, cannot run two at a time") | 2963 | (error "Another update process is in progress, cannot run two at a time") |
| 2967 | ;; This is not very efficient; ewoc could use a new function here. | 2964 | ;; This is not very efficient; ewoc could use a new function here. |
| 2968 | ;; We clear the ewoc, but remember the marked files so that we can | 2965 | ;; We clear the ewoc, but remember the marked files so that we can |
| 2969 | ;; mark them after the refresh is done. | 2966 | ;; mark them again after the refresh is done. |
| 2970 | (setq vc-status-crt-marked | 2967 | (setq vc-status-crt-marked |
| 2971 | (mapcar | 2968 | (mapcar |
| 2972 | (lambda (elem) | 2969 | (lambda (elem) |