(vc-before-save): Be careful not to prevent saving the file.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 13c5932..97db7c2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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>

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 06cdbef..c033b6e 100644 (file)
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -750,11 +750,12 @@ Before doing that, check if there are any old backups and get rid of them."
   ;; 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))