From c8149699a2a785e661170eb347a90328ff63a621 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Wed, 23 Apr 2008 04:07:11 +0000 Subject: [PATCH] (vc-git-status-printer): Deal with directories. --- lisp/ChangeLog | 2 ++ lisp/vc-git.el | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f3cb9acb665..6a7f2c271bc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2008-04-23 Dan Nicolaescu + * 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 175f7dcf921..19e5272618d 100644 --- 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)))) -- 2.39.5