(pop-up-frame-function): Remove choice nil since it

[gnu-emacs] / lisp / shadowfile.el

diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el
index ece12c367e12c5265742e7f426da8db801c72d39..aa99b1e785e9920d75d7da01c7b5a5704edb4eba 100644 (file)
--- a/lisp/shadowfile.el
+++ b/lisp/shadowfile.el
@@ -1,7 +1,7 @@
 ;;; shadowfile.el --- automatic file copying
 
 ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Keywords: comm files
@@ -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)))))))