mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-04 11:40:22 +00:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Stefan Monnier 2008-03-27 15:00:32 +00:00
parent c313b5febc
commit f42af25505
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/ChangeLog
View File

@ -1,5 +1,7 @@
2008-03-27 Stefan Monnier <monnier@iro.umontreal.ca> 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. * image-mode.el (image-mode-reapply-winprops): Fix last change.
2008-03-27 Kenichi Handa <handa@ni.aist.go.jp> 2008-03-27 Kenichi Handa <handa@ni.aist.go.jp>

11
lisp/vc-hooks.el
View File

@ -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 ;; and version backups should be made, copy the file to
;; another name. This enables local diffs and local reverting. ;; another name. This enables local diffs and local reverting.
(let ((file buffer-file-name)) (let ((file buffer-file-name))
(and (vc-backend file) (ignore-errors ;Be careful not to prevent saving the file.
(vc-up-to-date-p file) (and (vc-backend file)
(eq (vc-checkout-model file) 'implicit) (vc-up-to-date-p file)
(vc-call make-version-backups-p file) (eq (vc-checkout-model file) 'implicit)
(vc-make-version-backup file)))) (vc-call make-version-backups-p file)
(vc-make-version-backup file)))))
(declare-function vc-dired-resynch-file "vc" (file)) (declare-function vc-dired-resynch-file "vc" (file))