diff options
| author | Dan Nicolaescu | 2008-07-22 02:20:10 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-07-22 02:20:10 +0000 |
| commit | d1bfcce10871c6def89b62f1fdce28edb2f60ca5 (patch) | |
| tree | 71629f35b78e3953fe2c645fa7e122128899fee1 | |
| parent | 776f7a5f62528f5c6f9dc019bab92a53fa3a11cb (diff) | |
| download | emacs-d1bfcce10871c6def89b62f1fdce28edb2f60ca5.tar.gz emacs-d1bfcce10871c6def89b62f1fdce28edb2f60ca5.zip | |
(vc-git-status-printer): Update the directory display
to match the default.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/vc-git.el | 5 |
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 @@ | |||
| 1 | 2008-07-22 Dan Nicolaescu <dann@ics.uci.edu> | 1 | 2008-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 | ||
| 5 | 2008-07-21 Chong Yidong <cyd@stupidchicken.com> | 8 | 2008-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)))) |