aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2006-01-06 11:55:35 +0000
committerEli Zaretskii2006-01-06 11:55:35 +0000
commit0133dab9be13e0d97d58a2fb3675171fe52311f0 (patch)
tree074b11331785ac236042dfacc772af1bb58381e9
parent582761a6e53bc8238cf9fb9a6bb73cc9fd683be7 (diff)
downloademacs-0133dab9be13e0d97d58a2fb3675171fe52311f0.tar.gz
emacs-0133dab9be13e0d97d58a2fb3675171fe52311f0.zip
(basic-save-buffer-2): If backing-up failed, reset buffer-backed-up to nil.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/files.el4
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9b009fd7fb8..19900e1ddf1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12006-01-06 Sven Joachim <svenjoac@gmx.de> (tiny change)
2
3 * files.el (basic-save-buffer-2): If backing-up failed, reset
4 buffer-backed-up to nil.
5
12006-01-06 Nick Roberts <nickrob@snap.net.nz> 62006-01-06 Nick Roberts <nickrob@snap.net.nz>
2 7
3 * progmodes/gud.el (gdb-script-skip-to-head) 8 * progmodes/gud.el (gdb-script-skip-to-head)
diff --git a/lisp/files.el b/lisp/files.el
index 0522f47f15f..2b439e20d3f 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3469,7 +3469,9 @@ Before and after saving the buffer, this function runs
3469 ;; If we get an error writing the new file, and we made 3469 ;; If we get an error writing the new file, and we made
3470 ;; the backup by renaming, undo the backing-up. 3470 ;; the backup by renaming, undo the backing-up.
3471 (and setmodes (not success) 3471 (and setmodes (not success)
3472 (rename-file (cdr setmodes) buffer-file-name)))))) 3472 (progn
3473 (rename-file (cdr setmodes) buffer-file-name t)
3474 (setq buffer-backed-up nil)))))))
3473 setmodes)) 3475 setmodes))
3474 3476
3475(defun diff-buffer-with-file (&optional buffer) 3477(defun diff-buffer-with-file (&optional buffer)