diff options
| author | Dan Nicolaescu | 2008-07-22 02:18:29 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-07-22 02:18:29 +0000 |
| commit | 776f7a5f62528f5c6f9dc019bab92a53fa3a11cb (patch) | |
| tree | 635ae42c97669234c47b9ccb3d05162120767874 | |
| parent | c7bd577b67f5aab517047fa08b4437244bb1124d (diff) | |
| download | emacs-776f7a5f62528f5c6f9dc019bab92a53fa3a11cb.tar.gz emacs-776f7a5f62528f5c6f9dc019bab92a53fa3a11cb.zip | |
(vc-dir-recompute-file-state): Add workaround for CVS.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/vc-dir.el | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 48ff3413337..93129d56600 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-07-22 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * vc-dir.el (vc-dir-recompute-file-state): Add workaround for CVS. | ||
| 4 | |||
| 1 | 2008-07-21 Chong Yidong <cyd@stupidchicken.com> | 5 | 2008-07-21 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * menu-bar.el (menu-bar-line-wrapping-menu): Use Visual Line mode | 7 | * menu-bar.el (menu-bar-line-wrapping-menu): Use Visual Line mode |
diff --git a/lisp/vc-dir.el b/lisp/vc-dir.el index 69117c8f2f3..1069f40e2ea 100644 --- a/lisp/vc-dir.el +++ b/lisp/vc-dir.el | |||
| @@ -772,6 +772,11 @@ If it is a file, return the corresponding cons for the file itself." | |||
| 772 | 772 | ||
| 773 | (defun vc-dir-recompute-file-state (fname def-dir) | 773 | (defun vc-dir-recompute-file-state (fname def-dir) |
| 774 | (let* ((file-short (file-relative-name fname def-dir)) | 774 | (let* ((file-short (file-relative-name fname def-dir)) |
| 775 | (remove-me-when-CVS-works | ||
| 776 | (when (eq vc-dir-backend 'CVS) | ||
| 777 | ;; FIXME: Warning: UGLY HACK. The CVS backend caches the state | ||
| 778 | ;; info, this forces the backend to update it. | ||
| 779 | (vc-call-backend vc-dir-backend 'registered fname)) | ||
| 775 | (state (vc-call-backend vc-dir-backend 'state fname)) | 780 | (state (vc-call-backend vc-dir-backend 'state fname)) |
| 776 | (extra (vc-call-backend vc-dir-backend | 781 | (extra (vc-call-backend vc-dir-backend |
| 777 | 'status-fileinfo-extra fname))) | 782 | 'status-fileinfo-extra fname))) |