(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 13e3bdb0248761e43c870f649979fa64e9e794ad..c28cc37e29eb42e3eaac6fb0999cca29a689e306 100644 (file)
--- 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 ece12c367e12c5265742e7f426da8db801c72d39..04da2c5eb3ef43972779a7bdbec333b5b6b11697 100644 (file)
--- 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)))))))