From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 6 Jan 2006 11:55:35 +0000 (+0000)
Subject: (basic-save-buffer-2): If backing-up failed, reset buffer-backed-up to nil.
X-Git-Tag: emacs-pretest-22.0.90~4856
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0133dab9be13e0d97d58a2fb3675171fe52311f0;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9b009fd7fb8..19900e1ddf1 100644
--- 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 0522f47f15f..2b439e20d3f 100644
--- 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)