(vc-git-status-printer): Deal with directories.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f3cb9acb665c5ebe5897a4c23467ceb7c831d3ca..6a7f2c271bcff844d1b825d7e652a6609d1c9440 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2008-04-23  Dan Nicolaescu  <dann@ics.uci.edu>
 
+       * vc-git.el (vc-git-status-printer): Deal with directories.
+
        * vc.el (vc-next-action): Look at more than the first file to
        determine the state.
 

diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index 175f7dcf92191d3560b13f98165c0a4cc4a5010b..19e5272618de45dc96aef11abe95efb91505bb88 100644 (file)
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -87,7 +87,7 @@
 ;; - comment-history (file)                       ??
 ;; - update-changelog (files)                     COULD BE SUPPORTED
 ;; * diff (file &optional rev1 rev2 buffer)       OK
-;; - revision-completion-table (files)            NEEDED?
+;; - revision-completion-table (files)            OK
 ;; - annotate-command (file buf &optional rev)    OK
 ;; - annotate-time ()                             OK
 ;; - annotate-current-time ()                     NOT NEEDED
@@ -108,7 +108,10 @@
 ;; - find-file-hook ()                            NOT NEEDED
 ;; - find-file-not-found-hook ()                   NOT NEEDED
 
-(eval-when-compile (require 'cl) (require 'vc) (require 'grep))
+(eval-when-compile
+  (require 'cl)
+  (require 'vc)
+  (require 'grep))
 
 (defvar git-commits-coding-system 'utf-8
   "Default coding system for git commits.")
@@ -287,7 +290,9 @@
 
 (defun vc-git-status-printer (info)
   "Pretty-printer for the vc-dir-fileinfo structure."
-  (let* ((state (vc-dir-fileinfo->state info))
+  (let* ((state (if (vc-dir-fileinfo->directory info)
+                   'DIRECTORY
+                 (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))))