[Emacs-diffs] /srv/bzr/emacs/trunk r99579: * net/tramp.el (tramp-handle-write-region): START can be a string.

[Michael Albinus]

------------------------------------------------------------
revno: 99579
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Sun 2010-02-28 12:36:39 +0100
message:
  * net/tramp.el (tramp-handle-write-region): START can be a string.
  Take care in the checks.
modified:
  lisp/ChangeLog
  lisp/net/tramp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-02-28 10:27:39 +0000
+++ b/lisp/ChangeLog    2010-02-28 11:36:39 +0000
@@ -1,5 +1,11 @@
 2010-02-28  Michael Albinus  <address@hidden>
 
+       * net/tramp.el (tramp-handle-write-region): START can be a string.
+       Take care in the checks.  Reported by Dan Davison
+       <address@hidden>.
+
+2010-02-28  Michael Albinus  <address@hidden>
+
        * net/dbus.el (dbus-introspect, dbus-get-property)
        (dbus-set-property, dbus-get-all-properties): Use
        `dbus-call-method' when noninteractive.  (Bug#5645)

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2010-02-22 13:48:52 +0000
+++ b/lisp/net/tramp.el 2010-02-28 11:36:39 +0000
@@ -5045,11 +5045,12 @@
          ;; 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))