Mercurial > emacs

changeset 96881:44c60e2cb9ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-git-status-printer): Update the directory display to match the default.
author Dan Nicolaescu <dann@ics.uci.edu>
date Tue, 22 Jul 2008 02:20:10 +0000
parents 938dd02137bc
children ee9446fab77c
files lisp/ChangeLog lisp/vc-git.el
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Tue Jul 22 02:18:29 2008 +0000
+++ b/lisp/ChangeLog	Tue Jul 22 02:20:10 2008 +0000
@@ -1,5 +1,8 @@
 2008-07-22  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	* vc-git.el (vc-git-status-printer): Update the directory display
+	to match the default.
+
 	* vc-dir.el (vc-dir-recompute-file-state): Add workaround for CVS.	
 
 2008-07-21  Chong Yidong  <cyd@stupidchicken.com>
--- a/lisp/vc-git.el	Tue Jul 22 02:18:29 2008 +0000
+++ b/lisp/vc-git.el	Tue Jul 22 02:20:10 2008 +0000
@@ -268,9 +268,8 @@
 
 (defun vc-git-status-printer (info)
   "Pretty-printer for the vc-dir-fileinfo structure."
-  (let* ((state (if (vc-dir-fileinfo->directory info)
-		    'DIRECTORY
-		  (vc-dir-fileinfo->state info)))
+  (let* ((isdir (vc-dir-fileinfo->directory info))
+	 (state (if isdir "" (vc-dir-fileinfo->state info)))
          (extra (vc-dir-fileinfo->extra info))
          (old-perm (when extra (vc-git-extra-fileinfo->old-perm extra)))
          (new-perm (when extra (vc-git-extra-fileinfo->new-perm extra))))