diff options
author | Kenichi Handa <handa@m17n.org> | 2011-07-07 08:28:00 +0900 |
---|---|---|
committer | Kenichi Handa <handa@m17n.org> | 2011-07-07 08:28:00 +0900 |
commit | d2a0a50628933d3cdb09818eee2e17f55e22531f (patch) | |
tree | d19c8e71eb63eb6ccd204c2f36f406e4cf853154 /lisp/net/ange-ftp.el | |
parent | c805dec0b5fa81b5c9f2b724e2ec12a17d723aca (diff) | |
parent | 354cf0ba0b20108c9776be1d868458893bc2cd54 (diff) | |
download | emacs-d2a0a50628933d3cdb09818eee2e17f55e22531f.tar.gz |
merge trunk
Diffstat (limited to 'lisp/net/ange-ftp.el')
-rw-r--r-- | lisp/net/ange-ftp.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 0493ead7bbf..41716dbdacd 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -1723,11 +1723,12 @@ good, skip, fatal, or unknown." ;;; Temporary file location and deletion... ;;; ------------------------------------------------------------ -(defun ange-ftp-make-tmp-name (host) +(defun ange-ftp-make-tmp-name (host &optional suffix) "This routine will return the name of a new file." (make-temp-file (if (ange-ftp-use-gateway-p host) ange-ftp-gateway-tmp-name-template - ange-ftp-tmp-name-template))) + ange-ftp-tmp-name-template) + nil suffix)) (defun ange-ftp-del-tmp-name (filename) "Force to delete temporary file." @@ -3278,6 +3279,7 @@ system TYPE.") (name (ange-ftp-quote-string (nth 2 parsed))) (temp (ange-ftp-make-tmp-name host)) (binary (ange-ftp-binary-file filename)) + (buffer-file-type buffer-file-type) (abbr (ange-ftp-abbreviate-filename filename)) (coding-system-used last-coding-system-used) size) @@ -4138,7 +4140,8 @@ directory, so that Emacs will know its current contents." (let* ((fn1 (expand-file-name file)) (pa1 (ange-ftp-ftp-name fn1))) (if pa1 - (let ((tmp1 (ange-ftp-make-tmp-name (car pa1)))) + (let ((tmp1 (ange-ftp-make-tmp-name (car pa1) + (file-name-extension file t)))) (ange-ftp-copy-file-internal fn1 tmp1 t nil (format "Getting %s" fn1)) tmp1)))) |