[Emacs-diffs] emacs/lisp shadowfile.el

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Richard M. Stallman <rms>       08/12/22 20:20:06

Modified files:
        lisp           : shadowfile.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/shadowfile.el?cvsroot=emacs&r1=1.41&r2=1.42

Patches:
Index: shadowfile.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/shadowfile.el,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- shadowfile.el       3 Dec 2008 05:48:32 -0000       1.41
+++ shadowfile.el       22 Dec 2008 20:20:04 -0000      1.42
@@ -575,7 +575,13 @@
       (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))
             (shadow-remove-from-todo s))
         (error (message "Shadow %s not updated!" (cdr s)))))))