(basic-save-buffer-2): If backing-up failed, reset buffer-backed-up to nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9b009fd7fb8c378677b6f48ce5fe4e59ed78a6c7..19900e1ddf117e7eea14e11c6acadf84128d42e7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-06  Sven Joachim  <svenjoac@gmx.de>  (tiny change)
+
+       * files.el (basic-save-buffer-2): If backing-up failed, reset
+       buffer-backed-up to nil.
+
 2006-01-06  Nick Roberts  <nickrob@snap.net.nz>
 
        * progmodes/gud.el (gdb-script-skip-to-head)

diff --git a/lisp/files.el b/lisp/files.el
index 0522f47f15fb1130e3f32e43b097294c3fc31873..2b439e20d3ff938c0f85af7a5ccacf99b9e0f2e1 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3469,7 +3469,9 @@ Before and after saving the buffer, this function runs
            ;; If we get an error writing the new file, and we made
            ;; the backup by renaming, undo the backing-up.
            (and setmodes (not success)
-                (rename-file (cdr setmodes) buffer-file-name))))))
+                (progn
+                  (rename-file (cdr setmodes) buffer-file-name t)
+                  (setq buffer-backed-up nil)))))))
     setmodes))
 
 (defun diff-buffer-with-file (&optional buffer)