From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 22 Dec 2008 20:20:25 +0000 (+0000)
Subject: (shadow-copy-file): Handle buffer-swapped-with.
X-Git-Tag: emacs-pretest-23.0.90~908
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=348a60a8f3ee881a5fbeda36ae73bec64c6237ac;p=emacs.git

(shadow-copy-file): Handle buffer-swapped-with.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 15ef4269f51..5c15bfb1f4d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2008-12-22  Richard M Stallman  <rms@gnu.org>
 
+	* shadowfile.el (shadow-copy-file): Handle buffer-swapped-with.
+
+	* files.el (buffer-swapped-with): New variable.
+	(basic-save-buffer-0): Most of basic-save-buffer moved here.
+	(basic-save-buffer): Unswap the buffer temporarily if nec.
+
 	* dired.el (dired-readin): Inhibit modification hooks.
 
 2008-12-22  Ulf Jasper  <ulf.jasper@web.de>
diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el
index 751a33d260d..ece12c367e1 100644
--- a/lisp/shadowfile.el
+++ b/lisp/shadowfile.el
@@ -574,8 +574,14 @@ site."
     (when buffer
       (set-buffer buffer)
       (condition-case i
-          (progn
-            (write-region nil nil to)
+	  (progn
+	    (if buffer-swapped-with
+		(progn
+		  (buffer-swap-text buffer-swapped-with)
+		  (unwind-protect
+		      (write-region nil nil to)
+		    (buffer-swap-text buffer-swapped-with)))
+	      (write-region nil nil to))
             (shadow-remove-from-todo s))
         (error (message "Shadow %s not updated!" (cdr s)))))))