Mercurial > emacs

comparison lisp/net/tramp-imap.el @ 108816:94d1d8a6dcfd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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
265 nil nil (nth 7 (file-attributes filename)))) 265 nil nil (nth 7 (file-attributes filename))))
266 ;; One of them is not located on a IMAP mailbox. 266 ;; One of them is not located on a IMAP mailbox.
267 (insert-file-contents filename) 267 (insert-file-contents filename)
268 (write-region (point-min) (point-max) newname))))) 268 (write-region (point-min) (point-max) newname)))))
269 269
270 (when (eq op 'rename) 270 (when (eq op 'rename) (delete-file filename))))
271 (tramp-compat-delete-file filename))))
272 271
273 ;; TODO: revise this much 272 ;; TODO: revise this much
274 (defun tramp-imap-handle-expand-file-name (name &optional dir) 273 (defun tramp-imap-handle-expand-file-name (name &optional dir)
275 "Like `expand-file-name' for Tramp files." 274 "Like `expand-file-name' for Tramp files."
276 ;; If DIR is not given, use DEFAULT-DIRECTORY or "/". 275 ;; If DIR is not given, use DEFAULT-DIRECTORY or "/".