(vc-svn-parse-status): Accept ?D for removed files (bug#3213).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bb0a60ec96229e4b751c0bbc1961995853048888..b4e87672e345bc176e83f1baebd28732298aa224 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-05  Bob Rogers  <rogers-emacs@rgrjr.dyndns.org>  (tiny change)
+
+       * vc-svn.el (vc-svn-parse-status): ?D is for removed files (bug#3213).
+
 2009-05-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * vc.el (vc-delete-file): Add autoload cookie (bug#3209).

diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index 6eeb8985bfd125c094ad34a82baa9d5b19a511fe..2d5c239e3b2fa40966a0f82e95c9bdf334e6968a 100644 (file)
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -157,9 +157,9 @@ want to force an empty list of arguments, use t."
 (defun vc-svn-after-dir-status (callback &optional remote)
   (let ((state-map '((?A . added)
                      (?C . conflict)
-                     (?D . removed)
                      (?I . ignored)
                      (?M . edited)
+                     (?D . removed)
                      (?R . removed)
                      (?? . unregistered)
                      ;; This is what vc-svn-parse-status does.
@@ -662,7 +662,7 @@ information about FILENAME and return its status."
             'edited))
          ((eq status ?I)
           (vc-file-setprop file 'vc-state 'ignored))
-         ((eq status ?R)
+         ((memq status '(?D ?R))
           (vc-file-setprop file 'vc-state 'removed))
          (t 'edited)))))
     (when filename (vc-file-getprop filename 'vc-state))))