(vc-delete-file): Make sure the buffer is deleted and

vc-dir buffers are updated.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 14773bad0834e9788f332a8f89c6a9332d0fef0d..1cc72d5b2df8e764018eba73657337477d9c4119 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-23  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * vc.el (vc-delete-file): Make sure the buffer is deleted and
+       vc-dir buffers are updated.
+
 2008-05-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * vc.el (vc-delete-file): Don't try to resynch the buffer.

diff --git a/lisp/vc.el b/lisp/vc.el
index 345a7bf53c4839e5e29af7870c038327ad280a79..f5e332cd782c3bb6f66fe9323beaf9b9f1ba52ad 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -2445,10 +2445,9 @@ backend to NEW-BACKEND, and unregister FILE from the current backend.
     (when (file-exists-p file) (delete-file file))
     ;; Forget what VC knew about the file.
     (vc-file-clearprops file)
-    ;; Since we've deleted the file and we've made sure the buffer had no
-    ;; unsaved changes, we can kill the buffer.  Much easier than trying to
-    ;; properly refresh its VC state.
-    (when buf (kill-buffer buf))))
+    ;; Make sure the buffer is deleted and the *vc-dir* buffers are
+    ;; updated after this.
+    (vc-resynch-buffer file nil t)))
 
 ;;;###autoload
 (defun vc-rename-file (old new)