Mercurial > emacs
changeset 93316:709d31efe571
(vc-before-save): Be careful not to prevent saving the file.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 27 Mar 2008 15:00:32 +0000 |
| parents | cb3570d14a66 |
| children | ee177d94262a |
| files | lisp/ChangeLog lisp/vc-hooks.el |
| diffstat | 2 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Mar 27 14:59:30 2008 +0000 +++ b/lisp/ChangeLog Thu Mar 27 15:00:32 2008 +0000 @@ -1,5 +1,7 @@ 2008-03-27 Stefan Monnier <monnier@iro.umontreal.ca> + * vc-hooks.el (vc-before-save): Don't prevent saving the file. + * image-mode.el (image-mode-reapply-winprops): Fix last change. 2008-03-27 Kenichi Handa <handa@ni.aist.go.jp>
--- a/lisp/vc-hooks.el Thu Mar 27 14:59:30 2008 +0000 +++ b/lisp/vc-hooks.el Thu Mar 27 15:00:32 2008 +0000 @@ -750,11 +750,12 @@ ;; and version backups should be made, copy the file to ;; another name. This enables local diffs and local reverting. (let ((file buffer-file-name)) - (and (vc-backend file) - (vc-up-to-date-p file) - (eq (vc-checkout-model file) 'implicit) - (vc-call make-version-backups-p file) - (vc-make-version-backup file)))) + (ignore-errors ;Be careful not to prevent saving the file. + (and (vc-backend file) + (vc-up-to-date-p file) + (eq (vc-checkout-model file) 'implicit) + (vc-call make-version-backups-p file) + (vc-make-version-backup file))))) (declare-function vc-dired-resynch-file "vc" (file))