From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 25 Dec 2008 08:08:46 +0000 (+0000)
Subject: (shadow-copy-file): Revert previous change.
X-Git-Tag: emacs-pretest-23.0.90~875
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=737ef6823b9745017310d25f2afe89d04f732224;p=emacs.git

(shadow-copy-file): Revert previous change.
This code as it was should work properly with buffer-swapped-with.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 13e3bdb0248..c28cc37e29e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-25  Richard M Stallman  <rms@gnu.org>
+
+	* shadowfile.el (shadow-copy-file): Revert previous change.
+	This code as it was should work properly with buffer-swapped-with.
+
 2008-12-24  Francois Fleuret  <francois.fleuret@idiap.ch>  (tiny change)
 
 	* textmodes/tex-mode.el (tex-bibtex-file): Use tex-main-file.
diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el
index ece12c367e1..04da2c5eb3e 100644
--- a/lisp/shadowfile.el
+++ b/lisp/shadowfile.el
@@ -575,13 +575,7 @@ site."
       (set-buffer buffer)
       (condition-case i
 	  (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))
+            (write-region nil nil to)
             (shadow-remove-from-todo s))
         (error (message "Shadow %s not updated!" (cdr s)))))))