comparison lisp/vc.el @ 93367:07bc5cae1251

(vc-status-mode-map, vc-status-menu-map): Bind vc-update and vc-print-log.
author Dan Nicolaescu <dann@ics.uci.edu>
date Sat, 29 Mar 2008 00:43:56 +0000
parents 84a5da4da422
children 8e46096e0cb3
comparison
equal deleted inserted replaced
93366:84a5da4da422 93367:07bc5cae1251
615 (require 'vc-hooks) 615 (require 'vc-hooks)
616 (require 'tool-bar) 616 (require 'tool-bar)
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
624 (if (not (assoc 'vc-parent-buffer minor-mode-alist)) 623 (if (not (assoc 'vc-parent-buffer minor-mode-alist))
625 (setq minor-mode-alist 624 (setq minor-mode-alist
2751 '(menu-item "Register" vc-status-register 2750 '(menu-item "Register" vc-status-register
2752 :help "Register file set into the version control system")) 2751 :help "Register file set into the version control system"))
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] '("--"))
2763 (define-key map [next-line] 2761 (define-key map [next-line]
2764 '(menu-item "Next line" vc-status-next-line 2762 '(menu-item "Next line" vc-status-next-line
2819 (define-key map "=" 'vc-diff) 2817 (define-key map "=" 'vc-diff)
2820 (define-key map "a" 'vc-status-register) 2818 (define-key map "a" 'vc-status-register)
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)
2829 (define-key map "o" 'vc-status-find-file-other-window) 2826 (define-key map "o" 'vc-status-find-file-other-window)
2830 (define-key map "x" 'vc-status-hide-up-to-date) 2827 (define-key map "x" 'vc-status-hide-up-to-date)
2964 (interactive) 2961 (interactive)
2965 (if vc-status-process-buffer 2962 (if vc-status-process-buffer
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)
2973 (vc-status-fileinfo->name elem)) 2970 (vc-status-fileinfo->name elem))
2974 (ewoc-collect 2971 (ewoc-collect