# HG changeset patch # User Stefan Monnier # Date 1206630032 0 # Node ID 709d31efe571ad9bb3cce2013c928f66f304718a # Parent cb3570d14a6621e82de99f9ab891c0bf312a9b92 (vc-before-save): Be careful not to prevent saving the file. diff -r cb3570d14a66 -r 709d31efe571 lisp/ChangeLog --- 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 + * 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 diff -r cb3570d14a66 -r 709d31efe571 lisp/vc-hooks.el --- 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))