aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2009-05-05 04:17:27 +0000
committerStefan Monnier2009-05-05 04:17:27 +0000
commite6c01f094deddf0e8205e19cb5ea283fff7143f3 (patch)
tree662eab8869298d8afe1a7ba735bc7a4ea7ad3d52
parent97355c3832df985233437b4b356568aa2ccf7cde (diff)
downloademacs-e6c01f094deddf0e8205e19cb5ea283fff7143f3.tar.gz
emacs-e6c01f094deddf0e8205e19cb5ea283fff7143f3.zip
(vc-svn-parse-status): Accept ?D for removed files (bug#3213).
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc-svn.el4
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bb0a60ec962..b4e87672e34 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12009-05-05 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> (tiny change)
2
3 * vc-svn.el (vc-svn-parse-status): ?D is for removed files (bug#3213).
4
12009-05-05 Stefan Monnier <monnier@iro.umontreal.ca> 52009-05-05 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * vc.el (vc-delete-file): Add autoload cookie (bug#3209). 7 * vc.el (vc-delete-file): Add autoload cookie (bug#3209).
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index 6eeb8985bfd..2d5c239e3b2 100644
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -157,9 +157,9 @@ want to force an empty list of arguments, use t."
157(defun vc-svn-after-dir-status (callback &optional remote) 157(defun vc-svn-after-dir-status (callback &optional remote)
158 (let ((state-map '((?A . added) 158 (let ((state-map '((?A . added)
159 (?C . conflict) 159 (?C . conflict)
160 (?D . removed)
161 (?I . ignored) 160 (?I . ignored)
162 (?M . edited) 161 (?M . edited)
162 (?D . removed)
163 (?R . removed) 163 (?R . removed)
164 (?? . unregistered) 164 (?? . unregistered)
165 ;; This is what vc-svn-parse-status does. 165 ;; This is what vc-svn-parse-status does.
@@ -662,7 +662,7 @@ information about FILENAME and return its status."
662 'edited)) 662 'edited))
663 ((eq status ?I) 663 ((eq status ?I)
664 (vc-file-setprop file 'vc-state 'ignored)) 664 (vc-file-setprop file 'vc-state 'ignored))
665 ((eq status ?R) 665 ((memq status '(?D ?R))
666 (vc-file-setprop file 'vc-state 'removed)) 666 (vc-file-setprop file 'vc-state 'removed))
667 (t 'edited))))) 667 (t 'edited)))))
668 (when filename (vc-file-getprop filename 'vc-state)))) 668 (when filename (vc-file-getprop filename 'vc-state))))