diff options
| author | Dmitry Gutov | 2012-06-30 15:14:00 +0200 |
|---|---|---|
| committer | Michael Albinus | 2012-06-30 15:14:00 +0200 |
| commit | ac87de9763fbe6bf30fce7e85568a4195cf67ef5 (patch) | |
| tree | 532e217fcaf8a416b4c840363a7761558964f091 | |
| parent | 40c2a14362365474f50f2680235f4c000b2192b4 (diff) | |
| download | emacs-ac87de9763fbe6bf30fce7e85568a4195cf67ef5.tar.gz emacs-ac87de9763fbe6bf30fce7e85568a4195cf67ef5.zip | |
* vc/vc-hooks.el (vc-before-save): Clear cache if file has been
removed (likely outside Emacs).
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc/vc-hooks.el | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 15bc9720be9..d92783e03b0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-06-30 Dmitry Gutov <dgutov@yandex.ru> | ||
| 2 | |||
| 3 | * vc/vc-hooks.el (vc-before-save): Clear cache if file has been | ||
| 4 | removed (likely outside Emacs). | ||
| 5 | |||
| 1 | 2012-06-30 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2012-06-30 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * emacs-lisp/cl-lib.el: Require macroexp for its macros. | 8 | * emacs-lisp/cl-lib.el: Require macroexp for its macros. |
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index dff49c26e4e..a753004d784 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el | |||
| @@ -704,6 +704,8 @@ Before doing that, check if there are any old backups and get rid of them." | |||
| 704 | (let ((file buffer-file-name) | 704 | (let ((file buffer-file-name) |
| 705 | backend) | 705 | backend) |
| 706 | (ignore-errors ;Be careful not to prevent saving the file. | 706 | (ignore-errors ;Be careful not to prevent saving the file. |
| 707 | (unless (file-exists-p file) | ||
| 708 | (vc-file-clearprops file)) | ||
| 707 | (and (setq backend (vc-backend file)) | 709 | (and (setq backend (vc-backend file)) |
| 708 | (vc-up-to-date-p file) | 710 | (vc-up-to-date-p file) |
| 709 | (eq (vc-checkout-model backend (list file)) 'implicit) | 711 | (eq (vc-checkout-model backend (list file)) 'implicit) |