(vc-git-status-printer): Update the directory display

to match the default.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 93129d566006975b611faf8feea6bc9b007f8e0b..6be35f927c45f7dec5c7e9b80e2fa768a8b1be75 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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>

diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index 9f18418425e2106fe9499d1f224ad668b9db2504..5c0b9129485f5f8f3380a29facfed095e545f971 100644 (file)
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -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))))