diff options
Diffstat (limited to 'lisp/net/ange-ftp.el')
| -rw-r--r-- | lisp/net/ange-ftp.el | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 73cb2e57bb2..dcc6ddabcdc 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -1736,7 +1736,7 @@ good, skip, fatal, or unknown." (defun ange-ftp-del-tmp-name (filename) "Force to delete temporary file." - (delete-file filename 'force)) + (delete-file filename)) ;;;; ------------------------------------------------------------ @@ -3507,8 +3507,9 @@ system TYPE.") (file-exists-p file) (ange-ftp-real-file-executable-p file)))) -(defun ange-ftp-delete-file (file &optional force) - (interactive "fDelete file: ") +(defun ange-ftp-delete-file (file &optional trash) + (interactive (list (read-file-name "Delete file: " nil default-directory) + (null current-prefix-arg))) (setq file (expand-file-name file)) (let ((parsed (ange-ftp-ftp-name file))) (if parsed @@ -3526,7 +3527,7 @@ system TYPE.") (format "FTP Error: \"%s\"" (cdr result)) file))) (ange-ftp-delete-file-entry file)) - (ange-ftp-real-delete-file file force)))) + (ange-ftp-real-delete-file file trash)))) (defun ange-ftp-file-modtime (file) "Return the modification time of remote file FILE. @@ -3897,7 +3898,7 @@ E.g., (ange-ftp-add-file-entry newname) (ange-ftp-delete-file-entry filename)) (ange-ftp-copy-file-internal filename newname t nil) - (delete-file filename 'force)))) + (delete-file filename)))) (defun ange-ftp-rename-local-to-remote (filename newname) "Rename local file FILENAME to remote file NEWNAME." @@ -3906,7 +3907,7 @@ E.g., (msg (format "Renaming %s to %s" fabbr nabbr))) (ange-ftp-copy-file-internal filename newname t nil msg) (let (ange-ftp-process-verbose) - (delete-file filename 'force)))) + (delete-file filename)))) (defun ange-ftp-rename-remote-to-local (filename newname) "Rename remote file FILENAME to local file NEWNAME." @@ -3915,7 +3916,7 @@ E.g., (msg (format "Renaming %s to %s" fabbr nabbr))) (ange-ftp-copy-file-internal filename newname t nil msg) (let (ange-ftp-process-verbose) - (delete-file filename 'force)))) + (delete-file filename)))) (defun ange-ftp-rename-file (filename newname &optional ok-if-already-exists) (interactive "fRename file: \nFRename %s to file: \np") @@ -4196,7 +4197,7 @@ directory, so that Emacs will know its current contents." (if copy (unwind-protect (funcall 'load copy noerror nomessage nosuffix) - (delete-file copy 'force)) + (delete-file copy)) (or noerror (signal 'file-error (list "Cannot open load file" file))) nil)) @@ -4267,7 +4268,7 @@ NEWNAME should be the name to give the new compressed or uncompressed file.") (if (zerop (buffer-size)) (progn (let (ange-ftp-process-verbose) - (delete-file file 'force)) + (delete-file file)) (ange-ftp-copy-file-internal tmp2 nfile t nil msg2)))) (ange-ftp-del-tmp-name tmp1) (ange-ftp-del-tmp-name tmp2)))) @@ -4303,7 +4304,7 @@ NEWNAME should be the name to give the new compressed or uncompressed file.") (if (zerop (buffer-size)) (progn (let (ange-ftp-process-verbose) - (delete-file file 'force)) + (delete-file file)) (ange-ftp-copy-file-internal tmp2 nfile t nil msg2)))) (ange-ftp-del-tmp-name tmp1) (ange-ftp-del-tmp-name tmp2)))) |