diff options
| author | Dan Nicolaescu | 2008-05-23 21:38:32 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-05-23 21:38:32 +0000 |
| commit | 64e5a32f1997d780862f9262f67e3246313303de (patch) | |
| tree | a5a1fd0662c0c86de1ebaa947479e6af77e4d29c | |
| parent | ee91bfdf8c94c6281cf29b54c517c6079db8bc89 (diff) | |
| download | emacs-64e5a32f1997d780862f9262f67e3246313303de.tar.gz emacs-64e5a32f1997d780862f9262f67e3246313303de.zip | |
(vc-delete-file): Make sure the buffer is deleted and
vc-dir buffers are updated.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc.el | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 14773bad083..1cc72d5b2df 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-05-23 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * vc.el (vc-delete-file): Make sure the buffer is deleted and | ||
| 4 | vc-dir buffers are updated. | ||
| 5 | |||
| 1 | 2008-05-23 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2008-05-23 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * vc.el (vc-delete-file): Don't try to resynch the buffer. | 8 | * vc.el (vc-delete-file): Don't try to resynch the buffer. |
diff --git a/lisp/vc.el b/lisp/vc.el index 345a7bf53c4..f5e332cd782 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -2445,10 +2445,9 @@ backend to NEW-BACKEND, and unregister FILE from the current backend. | |||
| 2445 | (when (file-exists-p file) (delete-file file)) | 2445 | (when (file-exists-p file) (delete-file file)) |
| 2446 | ;; Forget what VC knew about the file. | 2446 | ;; Forget what VC knew about the file. |
| 2447 | (vc-file-clearprops file) | 2447 | (vc-file-clearprops file) |
| 2448 | ;; Since we've deleted the file and we've made sure the buffer had no | 2448 | ;; Make sure the buffer is deleted and the *vc-dir* buffers are |
| 2449 | ;; unsaved changes, we can kill the buffer. Much easier than trying to | 2449 | ;; updated after this. |
| 2450 | ;; properly refresh its VC state. | 2450 | (vc-resynch-buffer file nil t))) |
| 2451 | (when buf (kill-buffer buf)))) | ||
| 2452 | 2451 | ||
| 2453 | ;;;###autoload | 2452 | ;;;###autoload |
| 2454 | (defun vc-rename-file (old new) | 2453 | (defun vc-rename-file (old new) |