comparison lisp/net/tramp-ftp.el @ 85041:a42b8750a992

* net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el. (tramp-do-copy-or-rename-file-directly): Handle tmpfile only in the cond clauses where needed. (tramp-handle-write-region): Rearrange code for proper handling of tmpfile. * net/tramp-compat.el (tramp-compat-make-temp-file): New defsubst. * net/tramp.el: * net/tramp-fish.el: * net/tramp-ftp.el: * net/tramp-smb.el: Rename `tramp-make-temp-file' to `tramp-compat-make-temp-file'.
author Michael Albinus <michael.albinus@gmx.de>
date Thu, 04 Oct 2007 20:09:32 +0000
parents ef71cdab0d5c
children 7f134b676a0c bdb3fe0ba9fa
comparison
equal deleted inserted replaced
85040:9aefbe205648 85041:a42b8750a992
156 ((and (memq operation '(copy-file rename-file)) 156 ((and (memq operation '(copy-file rename-file))
157 (file-remote-p (cadr args)) 157 (file-remote-p (cadr args))
158 (not (tramp-ftp-file-name-p (cadr args)))) 158 (not (tramp-ftp-file-name-p (cadr args))))
159 (let* ((filename (car args)) 159 (let* ((filename (car args))
160 (newname (cadr args)) 160 (newname (cadr args))
161 (tmpfile (tramp-make-temp-file filename)) 161 (tmpfile (tramp-compat-make-temp-file filename))
162 (args (cddr args))) 162 (args (cddr args)))
163 (apply operation filename tmpfile args) 163 (apply operation filename tmpfile args)
164 (rename-file tmpfile newname (car args)))) 164 (rename-file tmpfile newname (car args))))
165 ;; Normally, the handlers must be discarded. 165 ;; Normally, the handlers must be discarded.
166 (t (let* ((inhibit-file-name-handlers 166 (t (let* ((inhibit-file-name-handlers