From: Dan Nicolaescu Date: Tue, 22 Jul 2008 02:20:10 +0000 (+0000) Subject: (vc-git-status-printer): Update the directory display X-Git-Tag: emacs-pretest-23.0.90~4008 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d1bfcce10871c6def89b62f1fdce28edb2f60ca5;p=emacs.git (vc-git-status-printer): Update the directory display to match the default. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 93129d56600..6be35f927c4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2008-07-22 Dan Nicolaescu + * 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 diff --git a/lisp/vc-git.el b/lisp/vc-git.el index 9f18418425e..5c0b9129485 100644 --- 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))))