diff options
| author | Stefan Monnier | 2008-04-16 03:00:53 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2008-04-16 03:00:53 +0000 |
| commit | 99e1b0c028f71e7726ca761e32e3b3316a90cb3c (patch) | |
| tree | 223e98b72c6444c1fd569b6644b9ce7d212b7710 | |
| parent | e1aec6fbf175d6767896dc051fcbbe91cd622fa4 (diff) | |
| download | emacs-99e1b0c028f71e7726ca761e32e3b3316a90cb3c.tar.gz emacs-99e1b0c028f71e7726ca761e32e3b3316a90cb3c.zip | |
Rename vc-status to vc-dir.
| -rw-r--r-- | lisp/vc-git.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/vc-git.el b/lisp/vc-git.el index 70ef18cf8f5..175f7dcf921 100644 --- a/lisp/vc-git.el +++ b/lisp/vc-git.el | |||
| @@ -286,14 +286,14 @@ | |||
| 286 | 'face 'font-lock-type-face)) | 286 | 'face 'font-lock-type-face)) |
| 287 | 287 | ||
| 288 | (defun vc-git-status-printer (info) | 288 | (defun vc-git-status-printer (info) |
| 289 | "Pretty-printer for the vc-status-fileinfo structure." | 289 | "Pretty-printer for the vc-dir-fileinfo structure." |
| 290 | (let* ((state (vc-status-fileinfo->state info)) | 290 | (let* ((state (vc-dir-fileinfo->state info)) |
| 291 | (extra (vc-status-fileinfo->extra info)) | 291 | (extra (vc-dir-fileinfo->extra info)) |
| 292 | (old-perm (when extra (vc-git-extra-fileinfo->old-perm extra))) | 292 | (old-perm (when extra (vc-git-extra-fileinfo->old-perm extra))) |
| 293 | (new-perm (when extra (vc-git-extra-fileinfo->new-perm extra)))) | 293 | (new-perm (when extra (vc-git-extra-fileinfo->new-perm extra)))) |
| 294 | (insert | 294 | (insert |
| 295 | " " | 295 | " " |
| 296 | (propertize (format "%c" (if (vc-status-fileinfo->marked info) ?* ? )) | 296 | (propertize (format "%c" (if (vc-dir-fileinfo->marked info) ?* ? )) |
| 297 | 'face 'font-lock-type-face) | 297 | 'face 'font-lock-type-face) |
| 298 | " " | 298 | " " |
| 299 | (propertize | 299 | (propertize |
| @@ -304,7 +304,7 @@ | |||
| 304 | 'mouse-face 'highlight) | 304 | 'mouse-face 'highlight) |
| 305 | " " (vc-git-permissions-as-string old-perm new-perm) | 305 | " " (vc-git-permissions-as-string old-perm new-perm) |
| 306 | " " | 306 | " " |
| 307 | (propertize (vc-git-escape-file-name (vc-status-fileinfo->name info)) | 307 | (propertize (vc-git-escape-file-name (vc-dir-fileinfo->name info)) |
| 308 | 'face 'font-lock-function-name-face | 308 | 'face 'font-lock-function-name-face |
| 309 | 'mouse-face 'highlight) | 309 | 'mouse-face 'highlight) |
| 310 | (vc-git-file-type-as-string old-perm new-perm) | 310 | (vc-git-file-type-as-string old-perm new-perm) |
| @@ -387,7 +387,7 @@ | |||
| 387 | "Return a list of (FILE STATE EXTRA) entries for DIR." | 387 | "Return a list of (FILE STATE EXTRA) entries for DIR." |
| 388 | ;; Further things that would have to be fixed later: | 388 | ;; Further things that would have to be fixed later: |
| 389 | ;; - how to handle unregistered directories | 389 | ;; - how to handle unregistered directories |
| 390 | ;; - how to support vc-status on a subdir of the project tree | 390 | ;; - how to support vc-dir on a subdir of the project tree |
| 391 | (vc-git-dir-status-goto-stage 'update-index nil update-function)) | 391 | (vc-git-dir-status-goto-stage 'update-index nil update-function)) |
| 392 | 392 | ||
| 393 | (defun vc-git-dir-status-files (dir files default-state update-function) | 393 | (defun vc-git-dir-status-files (dir files default-state update-function) |