aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-03-24 08:36:22 +0000
committerDan Nicolaescu2008-03-24 08:36:22 +0000
commit874f31a6f0b3ef12bcf7ea25accb6e0e6c196164 (patch)
treeff8270b523eb98c6fa63ceba2419b61674a3ed0e
parentd6f47dff597c7c0884be50a36acfbf1e694948bb (diff)
downloademacs-874f31a6f0b3ef12bcf7ea25accb6e0e6c196164.tar.gz
emacs-874f31a6f0b3ef12bcf7ea25accb6e0e6c196164.zip
(vc-cvs-after-dir-status, vc-cvs-parse-status): Detect
removed files.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/vc-cvs.el2
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5d9e0ec760b..05a5904e2ec 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12008-03-24 Dan Nicolaescu <dann@ics.uci.edu> 12008-03-24 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * vc-cvs.el (vc-cvs-after-dir-status, vc-cvs-parse-status): Detect
4 removed files.
5
3 * vc.el (vc-status-printer): Use a different face for missing files. 6 * vc.el (vc-status-printer): Use a different face for missing files.
4 (vc-status-hide-up-to-date): Rename from 7 (vc-status-hide-up-to-date): Rename from
5 vc-status-remove-up-to-date. Update all callers. 8 vc-status-remove-up-to-date. Update all callers.
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index a3a8b198956..a338b5115b8 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -855,6 +855,7 @@ state."
855 ((string-match "Needs Merge" status) 'needs-merge) 855 ((string-match "Needs Merge" status) 'needs-merge)
856 ((string-match "Needs \\(Checkout\\|Patch\\)" status) 'needs-patch) 856 ((string-match "Needs \\(Checkout\\|Patch\\)" status) 'needs-patch)
857 ((string-match "Locally Added" status) 'added) 857 ((string-match "Locally Added" status) 'added)
858 ((string-match "Locally Removed" status) 'removed)
858 (t 'edited)))))))) 859 (t 'edited))))))))
859 860
860(defun vc-cvs-dir-state-heuristic (dir) 861(defun vc-cvs-dir-state-heuristic (dir)
@@ -916,6 +917,7 @@ state."
916 ((string-match "Needs \\(Checkout\\|Patch\\)" status-str) 917 ((string-match "Needs \\(Checkout\\|Patch\\)" status-str)
917 'needs-patch) 918 'needs-patch)
918 ((string-match "Locally Added" status-str) 'added) 919 ((string-match "Locally Added" status-str) 'added)
920 ((string-match "Locally Removed" status-str) 'removed)
919 (t 'edited))) 921 (t 'edited)))
920 (unless (eq status 'up-to-date) 922 (unless (eq status 'up-to-date)
921 (push (cons file status) result)))))) 923 (push (cons file status) result))))))