diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-03-27 15:00:32 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-03-27 15:00:32 +0000 |
| commit | f42af25505dd568279f117fce47ea1b3db2277c9 (patch) | |
| tree | 871d062cc03f40bf1a5dbe7413d89173af81fc6e /lisp | |
| parent | c313b5febc718c68bb4ad869fc437a0373700de6 (diff) | |
| download | emacs-f42af25505dd568279f117fce47ea1b3db2277c9.tar.gz | |
(vc-before-save): Be careful not to prevent saving the file.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/vc-hooks.el | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 13c5932abb6..97db7c25091 100644 --- 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 06cdbef34e8..c033b6e8fbc 100644 --- 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)) |