Mercurial > emacs

diff lisp/net/tramp-imap.el @ 108460:00dd71f829e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <katsumi@flagship2>
date Thu, 06 May 2010 12:51:40 +0000
parents 2ee48fcc701c
children 7827d5a5c826
line wrap: on
line diff
--- a/lisp/net/tramp-imap.el	Wed May 05 10:17:53 2010 +0000
+++ b/lisp/net/tramp-imap.el	Thu May 06 12:51:40 2010 +0000
@@ -268,7 +268,7 @@
       (tramp-message v 0 "Transferring %s to %s...done" filename newname))
 
     (when (eq op 'rename)
-      (delete-file filename))))
+      (tramp-compat-delete-file filename 'force))))
 
 ;; TODO: revise this much
 (defun tramp-imap-handle-expand-file-name (name &optional dir)
@@ -553,7 +553,7 @@
   ;; (file-exists-p (file-name-directory filename)))
   (file-directory-p (file-name-directory filename)))
 
-(defun tramp-imap-handle-delete-file (filename)
+(defun tramp-imap-handle-delete-file (filename &optional force)
   "Like `delete-file' for Tramp files."
   (cond
    ((not (file-exists-p filename)) nil)