diff options
| author | Dan Nicolaescu | 2008-03-24 08:35:33 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-03-24 08:35:33 +0000 |
| commit | d6f47dff597c7c0884be50a36acfbf1e694948bb (patch) | |
| tree | fb48adcd12192e8735fa481fc005e1f8a06fb2d4 | |
| parent | 75cb52bed9dcfe06b1ceb0cb9213175b1caac95e (diff) | |
| download | emacs-d6f47dff597c7c0884be50a36acfbf1e694948bb.tar.gz emacs-d6f47dff597c7c0884be50a36acfbf1e694948bb.zip | |
(vc-status-printer): Use a different face for missing files.
(vc-status-hide-up-to-date): Rename from
vc-status-remove-up-to-date. Update all callers.
(vc-status-mode-map): Bind C-m.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/vc.el | 21 |
2 files changed, 19 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 91638c1dce8..5d9e0ec760b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2008-03-24 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * vc.el (vc-status-printer): Use a different face for missing files. | ||
| 4 | (vc-status-hide-up-to-date): Rename from | ||
| 5 | vc-status-remove-up-to-date. Update all callers. | ||
| 6 | (vc-status-mode-map): Bind C-m. | ||
| 7 | |||
| 1 | 2008-03-24 Alexandre Julliard <julliard@winehq.org> | 8 | 2008-03-24 Alexandre Julliard <julliard@winehq.org> |
| 2 | 9 | ||
| 3 | * vc-git.el (vc-git-after-dir-status-stage1): Move state matching | 10 | * vc-git.el (vc-git-after-dir-status-stage1): Move state matching |
diff --git a/lisp/vc.el b/lisp/vc.el index 1e3f2b9ff2a..0e633f5f993 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -585,12 +585,14 @@ | |||
| 585 | ;; | 585 | ;; |
| 586 | ;; - vc-status needs mouse bindings and some color bling. | 586 | ;; - vc-status needs mouse bindings and some color bling. |
| 587 | ;; | 587 | ;; |
| 588 | ;; - vc-status-header should be made backend specific. | ||
| 589 | ;; | ||
| 588 | ;; - vc-status needs to show missing files. It probably needs to have | 590 | ;; - vc-status needs to show missing files. It probably needs to have |
| 589 | ;; another state for those files. The user might want to restore | 591 | ;; another state for those files. The user might want to restore |
| 590 | ;; them, or remove them from the VCS. C-x v v might also need | 592 | ;; them, or remove them from the VCS. C-x v v might also need |
| 591 | ;; adjustments. | 593 | ;; adjustments. |
| 592 | ;; | 594 | ;; |
| 593 | ;; - vc-status needs a toolbar. | 595 | ;; - vc-status toolbar needs more icons. |
| 594 | ;; | 596 | ;; |
| 595 | ;; - vc-status: refresh should not completely wipe out the current | 597 | ;; - vc-status: refresh should not completely wipe out the current |
| 596 | ;; contents of the vc-status buffer. | 598 | ;; contents of the vc-status buffer. |
| @@ -2669,9 +2671,9 @@ With prefix arg READ-SWITCHES, specify a value to override | |||
| 2669 | " " | 2671 | " " |
| 2670 | (propertize | 2672 | (propertize |
| 2671 | (format "%-20s" state) | 2673 | (format "%-20s" state) |
| 2672 | 'face (if (eq state 'up-to-date) | 2674 | 'face (cond ((eq state 'up-to-date) 'font-lock-builtin-face) |
| 2673 | 'font-lock-builtin-face | 2675 | ((eq state 'missing) 'font-lock-warning-face) |
| 2674 | 'font-lock-variable-name-face) | 2676 | (t 'font-lock-variable-name-face)) |
| 2675 | 'mouse-face 'highlight) | 2677 | 'mouse-face 'highlight) |
| 2676 | " " | 2678 | " " |
| 2677 | (propertize | 2679 | (propertize |
| @@ -2727,8 +2729,8 @@ With prefix arg READ-SWITCHES, specify a value to override | |||
| 2727 | :enable (not vc-status-process-buffer) | 2729 | :enable (not vc-status-process-buffer) |
| 2728 | :help "Refresh the contents of the VC status buffer")) | 2730 | :help "Refresh the contents of the VC status buffer")) |
| 2729 | (define-key map [remup] | 2731 | (define-key map [remup] |
| 2730 | '(menu-item "Remove up-to-date" vc-status-remove-up-to-date | 2732 | '(menu-item "Hide up-to-date" vc-status-hide-up-to-date |
| 2731 | :help "Remove up-to-date items from display")) | 2733 | :help "Hide up-to-date items from display")) |
| 2732 | ;; VC commands. | 2734 | ;; VC commands. |
| 2733 | (define-key map [separator-vc-commands] '("--")) | 2735 | (define-key map [separator-vc-commands] '("--")) |
| 2734 | (define-key map [annotate] | 2736 | (define-key map [annotate] |
| @@ -2811,8 +2813,9 @@ With prefix arg READ-SWITCHES, specify a value to override | |||
| 2811 | ;; (define-key map "l" 'vc-status-print-log) | 2813 | ;; (define-key map "l" 'vc-status-print-log) |
| 2812 | ;; The remainder. | 2814 | ;; The remainder. |
| 2813 | (define-key map "f" 'vc-status-find-file) | 2815 | (define-key map "f" 'vc-status-find-file) |
| 2816 | (define-key map "\C-m" 'vc-status-find-file) | ||
| 2814 | (define-key map "o" 'vc-status-find-file-other-window) | 2817 | (define-key map "o" 'vc-status-find-file-other-window) |
| 2815 | (define-key map "x" 'vc-status-remove-up-to-date) | 2818 | (define-key map "x" 'vc-status-hide-up-to-date) |
| 2816 | (define-key map "q" 'bury-buffer) | 2819 | (define-key map "q" 'bury-buffer) |
| 2817 | (define-key map "g" 'vc-status-refresh) | 2820 | (define-key map "g" 'vc-status-refresh) |
| 2818 | (define-key map "\C-c\C-c" 'vc-status-kill-dir-status-process) | 2821 | (define-key map "\C-c\C-c" 'vc-status-kill-dir-status-process) |
| @@ -3146,8 +3149,8 @@ that share the same state." | |||
| 3146 | vc-status | 3149 | vc-status |
| 3147 | (lambda (crt) (vc-status-fileinfo->marked crt))))) | 3150 | (lambda (crt) (vc-status-fileinfo->marked crt))))) |
| 3148 | 3151 | ||
| 3149 | (defun vc-status-remove-up-to-date () | 3152 | (defun vc-status-hide-up-to-date () |
| 3150 | "Remove up-to-date items from display." | 3153 | "Hide up-to-date items from display." |
| 3151 | (interactive) | 3154 | (interactive) |
| 3152 | (ewoc-filter | 3155 | (ewoc-filter |
| 3153 | vc-status | 3156 | vc-status |