Mercurial > emacs
comparison lisp/net/tramp-ftp.el @ 108816:94d1d8a6dcfd
* net/tramp-compat.el (tramp-compat-delete-file): Use
`symbol-value' for backward compatibility.
* net/tramp.el (tramp-handle-make-symbolic-link)
(tramp-handle-load)
(tramp-do-copy-or-rename-file-via-buffer)
(tramp-do-copy-or-rename-file-directly)
(tramp-do-copy-or-rename-file-out-of-band)
(tramp-handle-process-file, tramp-handle-call-process-region)
(tramp-handle-shell-command, tramp-handle-file-local-copy)
(tramp-handle-insert-file-contents, tramp-handle-write-region)
(tramp-delete-temp-file-function): Use `delete-file' instead
of `tramp-compat-delete-file'.
* net/tramp-fish.el (tramp-fish-handle-delete-directory)
(tramp-fish-handle-make-symbolic-link)
(tramp-fish-handle-process-file): Use `delete-file' instead
of `tramp-compat-delete-file'.
* net/tramp-ftp.el (tramp-ftp-file-name-handler): Use
`delete-file' instead of `tramp-compat-delete-file'.
* net/tramp-gvfs.el (tramp-gvfs-handle-delete-file): Rename arg.
(tramp-gvfs-handle-write-region): Use `delete-file' instead of
`tramp-compat-delete-file'.
* net/tramp-imap.el (tramp-imap-do-copy-or-rename-file): Use
`delete-file' instead of `tramp-compat-delete-file'.
* net/tramp-smb.el (tramp-smb-handle-copy-file)
(tramp-smb-handle-file-local-copy, tramp-smb-handle-rename-file)
(tramp-smb-handle-write-region): Use `delete-file' instead of
`tramp-compat-delete-file'.
(tramp-smb-handle-delete-directory): Use 'trash as arg.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Fri, 28 May 2010 15:28:36 +0200 |
| parents | 511da81b16c5 |
| children | 280c8ae2476d |
comparison
equal
deleted
inserted
replaced
| 108815:93729e1f822d | 108816:94d1d8a6dcfd |
|---|---|
| 180 (apply operation filename tmpfile t (cdr args)) | 180 (apply operation filename tmpfile t (cdr args)) |
| 181 (apply operation filename tmpfile t)) | 181 (apply operation filename tmpfile t)) |
| 182 (unwind-protect | 182 (unwind-protect |
| 183 (rename-file tmpfile newname (car args)) | 183 (rename-file tmpfile newname (car args)) |
| 184 ;; Cleanup. | 184 ;; Cleanup. |
| 185 (ignore-errors (tramp-compat-delete-file tmpfile))))) | 185 (ignore-errors (delete-file tmpfile))))) |
| 186 | 186 |
| 187 ;; Normally, the handlers must be discarded. | 187 ;; Normally, the handlers must be discarded. |
| 188 ;; `inhibit-file-name-handlers' isn't sufficient, because the | 188 ;; `inhibit-file-name-handlers' isn't sufficient, because the |
| 189 ;; local file name could be in Tramp syntax as well (for | 189 ;; local file name could be in Tramp syntax as well (for |
| 190 ;; example, returning VMS file names like "/DISK$CAM:/AAA"). | 190 ;; example, returning VMS file names like "/DISK$CAM:/AAA"). |