Mercurial > emacs

changeset 93174:b7cb59b2c42d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author Dan Nicolaescu <dann@ics.uci.edu>
date Mon, 24 Mar 2008 08:35:33 +0000
parents 019e6794fecf
children 7b2ec9fec56e
files lisp/ChangeLog lisp/vc.el
diffstat 2 files changed, 19 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Mon Mar 24 08:21:43 2008 +0000
+++ b/lisp/ChangeLog	Mon Mar 24 08:35:33 2008 +0000
@@ -1,3 +1,10 @@
+2008-03-24  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* vc.el (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.
+
 2008-03-24  Alexandre Julliard  <julliard@winehq.org>
 
 	* vc-git.el (vc-git-after-dir-status-stage1): Move state matching
--- a/lisp/vc.el	Mon Mar 24 08:21:43 2008 +0000
+++ b/lisp/vc.el	Mon Mar 24 08:35:33 2008 +0000
@@ -585,12 +585,14 @@
 ;;
 ;; - vc-status needs mouse bindings and some color bling.
 ;;
+;; - vc-status-header should be made backend specific.
+;;
 ;; - vc-status needs to show missing files. It probably needs to have
 ;;   another state for those files. The user might want to restore
 ;;   them, or remove them from the VCS. C-x v v might also need
 ;;   adjustments.
 ;;
-;; - vc-status needs a toolbar.
+;; - vc-status toolbar needs more icons.
 ;;
 ;; - vc-status: refresh should not completely wipe out the current
 ;;   contents of the vc-status buffer.
@@ -2669,9 +2671,9 @@
      "   "
      (propertize
       (format "%-20s" state)
-      'face (if (eq state 'up-to-date)
-		'font-lock-builtin-face
-	      'font-lock-variable-name-face)
+      'face (cond ((eq state 'up-to-date) 'font-lock-builtin-face)
+		  ((eq state 'missing) 'font-lock-warning-face)
+		  (t 'font-lock-variable-name-face))
       'mouse-face 'highlight)
      " "
      (propertize
@@ -2727,8 +2729,8 @@
 		  :enable (not vc-status-process-buffer)
 		  :help "Refresh the contents of the VC status buffer"))
     (define-key map [remup]
-      '(menu-item "Remove up-to-date" vc-status-remove-up-to-date
-		  :help "Remove up-to-date items from display"))
+      '(menu-item "Hide up-to-date" vc-status-hide-up-to-date
+		  :help "Hide up-to-date items from display"))
     ;; VC commands.
     (define-key map [separator-vc-commands] '("--"))
     (define-key map [annotate]
@@ -2811,8 +2813,9 @@
     ;; (define-key map "l" 'vc-status-print-log)
     ;; The remainder.
     (define-key map "f" 'vc-status-find-file)
+    (define-key map "\C-m" 'vc-status-find-file)
     (define-key map "o" 'vc-status-find-file-other-window)
-    (define-key map "x" 'vc-status-remove-up-to-date)
+    (define-key map "x" 'vc-status-hide-up-to-date)
     (define-key map "q" 'bury-buffer)
     (define-key map "g" 'vc-status-refresh)
     (define-key map "\C-c\C-c" 'vc-status-kill-dir-status-process)
@@ -3146,8 +3149,8 @@
     vc-status
     (lambda (crt) (vc-status-fileinfo->marked crt)))))
 
-(defun vc-status-remove-up-to-date ()
-  "Remove up-to-date items from display."
+(defun vc-status-hide-up-to-date ()
+  "Hide up-to-date items from display."
   (interactive)
   (ewoc-filter
    vc-status