diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/vc-svn.el | 4 |
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 @@ | |||
| 1 | 2009-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 | |||
| 1 | 2009-05-05 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2009-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)))) |