* net/tramp.el (tramp-handle-write-region): START can be a string.

Take care in the checks.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cd06672cfb9516bf62963e2ad3c1d8fb28df736c..329139951a97c8ecadd1444bbc27b375c9214f53 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-28  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp.el (tramp-handle-write-region): START can be a string.
+       Take care in the checks.  Reported by Dan Davison
+       <davison@stats.ox.ac.uk>.
+
 2010-02-28  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/dbus.el (dbus-introspect, dbus-get-property)

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 102117f82e93897af610392f1ac0a9146e6ad0b3..0957c78eddf0b590c6ece7ddb72682ae4a17d17c 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -5045,11 +5045,12 @@ Returns a file name in `tramp-auto-save-directory' for autosaving this file."
          ;; encoding function, then that is used for encoding the
          ;; contents of the tmp file.
          (cond
-          ;; `rename-file' handles direct copy and out-of-band methods.
+          ;; `copy-file' handles direct copy and out-of-band methods.
           ((or (tramp-local-host-p v)
                (tramp-method-out-of-band-p
-                v (- (or end (point-max)) (or start (point-min)))))
-           (if (and (= (or end (point-max)) (point-max))
+                v (nth 7 (file-attributes tmpfile))))
+           (if (and (not (stringp start))
+                    (= (or end (point-max)) (point-max))
                     (= (or start (point-min)) (point-min))
                     (tramp-get-method-parameter
                      method 'tramp-copy-keep-tmpfile))