diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2010-05-28 15:28:36 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2010-05-28 15:28:36 +0200 |
| commit | eba082a2e478ed9d1c53d313413835d80ea1a49c (patch) | |
| tree | eeb91661942a4c2134ff869d446f24ef6ac7d4c9 /lisp/net/tramp-smb.el | |
| parent | 0ad1627dbeb2c525a78252de500cb92ac367d8e2 (diff) | |
| download | emacs-eba082a2e478ed9d1c53d313413835d80ea1a49c.tar.gz emacs-eba082a2e478ed9d1c53d313413835d80ea1a49c.tar.bz2 emacs-eba082a2e478ed9d1c53d313413835d80ea1a49c.zip | |
* 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.
Diffstat (limited to 'lisp/net/tramp-smb.el')
| -rw-r--r-- | lisp/net/tramp-smb.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 54cccb49053..9c4d991d0e1 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -345,7 +345,7 @@ PRESERVE-UID-GID is completely ignored." (condition-case err (rename-file tmpfile newname ok-if-already-exists) ((error quit) - (tramp-compat-delete-file tmpfile) + (delete-file tmpfile) (signal (car err) (cdr err)))) ;; Remote newname. @@ -382,7 +382,7 @@ PRESERVE-UID-GID is completely ignored." (lambda (file) (if (file-directory-p file) (tramp-compat-delete-directory file recursive) - (tramp-compat-delete-file file t))) + (tramp-compat-delete-file file 'trash))) ;; We do not want to delete "." and "..". (directory-files directory 'full "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*"))) @@ -611,7 +611,7 @@ PRESERVE-UID-GID is completely ignored." v (format "get \"%s\" \"%s\"" (tramp-smb-get-localname v) tmpfile)) ;; Oops, an error. We shall cleanup. - (tramp-compat-delete-file tmpfile) + (delete-file tmpfile) (tramp-error v 'file-error "Cannot make local copy of file `%s'" filename))) tmpfile))) @@ -861,7 +861,7 @@ target of the symlink differ." (condition-case err (rename-file tmpfile newname ok-if-already-exists) ((error quit) - (tramp-compat-delete-file tmpfile) + (delete-file tmpfile) (signal (car err) (cdr err)))) ;; Remote newname. @@ -882,7 +882,7 @@ target of the symlink differ." filename (tramp-smb-get-localname v))) (tramp-error v 'file-error "Cannot rename `%s'" filename))))) - (tramp-compat-delete-file filename))) + (delete-file filename))) (defun tramp-smb-handle-set-file-modes (filename mode) "Like `set-file-modes' for Tramp files." @@ -946,7 +946,7 @@ errors for shares like \"C$/\", which are common in Microsoft Windows." v (format "put %s \"%s\"" tmpfile (tramp-smb-get-localname v))) (tramp-error v 'file-error "Cannot write `%s'" filename)) - (tramp-compat-delete-file tmpfile))) + (delete-file tmpfile))) (unless (equal curbuf (current-buffer)) (tramp-error |