Mercurial > emacs
changeset 107256:122dff72a8ee
* net/tramp.el (tramp-handle-write-region): START can be a string.
Take care in the checks.
| author | Michael Albinus <albinus@detlef> |
|---|---|
| date | Sun, 28 Feb 2010 12:36:39 +0100 |
| parents | 6ea11661a516 |
| children | d8f04397b77a 6c9fc5ebcc4a |
| files | lisp/ChangeLog lisp/net/tramp.el |
| diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Feb 28 11:27:39 2010 +0100 +++ b/lisp/ChangeLog Sun Feb 28 12:36:39 2010 +0100 @@ -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)
--- a/lisp/net/tramp.el Sun Feb 28 11:27:39 2010 +0100 +++ b/lisp/net/tramp.el Sun Feb 28 12:36:39 2010 +0100 @@ -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))