aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/vc-git.el5
2 files changed, 5 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 93129d56600..6be35f927c4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12008-07-22 Dan Nicolaescu <dann@ics.uci.edu> 12008-07-22 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * vc-git.el (vc-git-status-printer): Update the directory display
4 to match the default.
5
3 * vc-dir.el (vc-dir-recompute-file-state): Add workaround for CVS. 6 * vc-dir.el (vc-dir-recompute-file-state): Add workaround for CVS.
4 7
52008-07-21 Chong Yidong <cyd@stupidchicken.com> 82008-07-21 Chong Yidong <cyd@stupidchicken.com>
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 @@
268 268
269(defun vc-git-status-printer (info) 269(defun vc-git-status-printer (info)
270 "Pretty-printer for the vc-dir-fileinfo structure." 270 "Pretty-printer for the vc-dir-fileinfo structure."
271 (let* ((state (if (vc-dir-fileinfo->directory info) 271 (let* ((isdir (vc-dir-fileinfo->directory info))
272 'DIRECTORY 272 (state (if isdir "" (vc-dir-fileinfo->state info)))
273 (vc-dir-fileinfo->state info)))
274 (extra (vc-dir-fileinfo->extra info)) 273 (extra (vc-dir-fileinfo->extra info))
275 (old-perm (when extra (vc-git-extra-fileinfo->old-perm extra))) 274 (old-perm (when extra (vc-git-extra-fileinfo->old-perm extra)))
276 (new-perm (when extra (vc-git-extra-fileinfo->new-perm extra)))) 275 (new-perm (when extra (vc-git-extra-fileinfo->new-perm extra))))