Mercurial > emacs
diff lisp/net/tramp.el @ 108806:511da81b16c5
Change delete-by-moving-to-trash so Lisp calls explicitly request trashing.
* src/fileio.c (Fdelete_file): Change meaning of optional arg to mean
whether to trash.
(internal_delete_file, Frename_file): Callers changed.
(delete_by_moving_to_trash): Doc fix.
(Fdelete_directory_internal): Don't move to trash.
* src/callproc.c (delete_temp_file):
* src/buffer.c (Fkill_buffer): Callers changed.
* src/lisp.h: Update prototype.
* lisp/diff.el (diff-sentinel):
* lisp/epg.el (epg--make-temp-file, epg-decrypt-string)
(epg-verify-string, epg-sign-string, epg-encrypt-string):
* lisp/jka-compr.el (jka-compr-partial-uncompress)
(jka-compr-call-process, jka-compr-write-region):
* lisp/server.el (server-sentinel): Remove optional arg from
delete-file, reverting 2010-05-03 change.
* lisp/dired.el (dired-delete-file): New arg TRASH.
(dired-internal-do-deletions): New arg TRASH. Use progress
reporter.
(dired-do-flagged-delete, dired-do-delete): Use trash.
* lisp/files.el (delete-directory): New arg TRASH.
* lisp/speedbar.el (speedbar-item-delete): Allow trashing.
* lisp/net/ange-ftp.el (ange-ftp-del-tmp-name, ange-ftp-delete-file)
(ange-ftp-rename-remote-to-remote)
(ange-ftp-rename-local-to-remote)
(ange-ftp-rename-remote-to-local, ange-ftp-load)
(ange-ftp-compress, ange-ftp-uncompress): Remove optional arg from
`delete-file'.
(ange-ftp-delete-directory): Add optional arg to `delete-file', to
allow trashing.
* lisp/net/tramp-compat.el (tramp-compat-delete-file): Rewrite to
handle new TRASH arg of `delete-file'.
* lisp/net/tramp-fish.el (tramp-fish-handle-delete-directory)
(tramp-fish-handle-delete-file)
(tramp-fish-handle-make-symbolic-link)
(tramp-fish-handle-process-file): Use null TRASH arg in
`tramp-compat-delete-file' call.
* lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler): Use null TRASH
arg in `tramp-compat-delete-file' call.
* lisp/net/tramp-gvfs.el (tramp-gvfs-handle-delete-file): Rename arg.
(tramp-gvfs-handle-write-region): Use null TRASH arg in
`tramp-compat-delete-file' call.
* lisp/net/tramp-imap.el (tramp-imap-handle-delete-file): Rename arg.
(tramp-imap-do-copy-or-rename-file): Use null TRASH arg in
`tramp-compat-delete-file' call.
* lisp/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 null TRASH arg in
tramp-compat-delete-file call.
(tramp-smb-handle-delete-directory): Use tramp-compat-delete-file.
(tramp-smb-handle-delete-file): Rename arg.
* lisp/net/tramp.el (tramp-handle-delete-file): Change FORCE arg to TRASH.
(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 null TRASH arg in
tramp-compat-delete-file call.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Thu, 27 May 2010 19:30:11 -0400 |
parents | 04bc013ba171 |
children | 94d1d8a6dcfd |
line wrap: on
line diff
--- a/lisp/net/tramp.el Thu May 27 11:49:01 2010 -0400 +++ b/lisp/net/tramp.el Thu May 27 19:30:11 2010 -0400 @@ -2544,7 +2544,7 @@ l-localname))))) (tramp-error l 'file-already-exists "File %s already exists" l-localname) - (tramp-compat-delete-file linkname 'force))) + (tramp-compat-delete-file linkname))) ;; If FILENAME is a Tramp name, use just the localname component. (when (tramp-tramp-file-p filename) @@ -2593,7 +2593,7 @@ ;; MUST-SUFFIX doesn't exist on XEmacs, so let it default to nil. (unwind-protect (load local-copy noerror t t) - (tramp-compat-delete-file local-copy 'force))))) + (tramp-compat-delete-file local-copy))))) t))) ;; Localname manipulation functions that grok Tramp localnames... @@ -3769,7 +3769,7 @@ ;; Set the mode. (set-file-modes newname (tramp-default-file-modes filename)) ;; If the operation was `rename', delete the original file. - (unless (eq op 'copy) (tramp-compat-delete-file filename 'force))) + (unless (eq op 'copy) (tramp-compat-delete-file filename))) (defun tramp-do-copy-or-rename-file-directly (op filename newname ok-if-already-exists keep-date preserve-uid-gid) @@ -3924,7 +3924,7 @@ ;; Save exit. (condition-case nil - (tramp-compat-delete-file tmpfile 'force) + (tramp-compat-delete-file tmpfile) (error))))))))) ;; Set the time and mode. Mask possible errors. @@ -3964,7 +3964,7 @@ (if dir-flag (tramp-compat-delete-directory (expand-file-name ".." tmpfile) 'recursive) - (tramp-compat-delete-file tmpfile 'force)) + (tramp-compat-delete-file tmpfile)) (error)))) ;; Expand hops. Might be necessary for gateway methods. @@ -4082,7 +4082,7 @@ ;; If the operation was `rename', delete the original file. (unless (eq op 'copy) (if (file-regular-p filename) - (tramp-compat-delete-file filename 'force) + (tramp-compat-delete-file filename) (tramp-compat-delete-directory filename 'recursive)))))) (defun tramp-handle-make-directory (dir &optional parents) @@ -4112,7 +4112,7 @@ (tramp-shell-quote-argument localname)))) (tramp-error v 'file-error "Couldn't delete %s" directory)))) -(defun tramp-handle-delete-file (filename &optional force) +(defun tramp-handle-delete-file (filename &optional trash) "Like `delete-file' for Tramp files." (setq filename (expand-file-name filename)) (with-parsed-tramp-file-name filename nil @@ -4629,7 +4629,7 @@ ;; Cleanup. We remove all file cache values for the connection, ;; because the remote process could have changed them. - (when tmpinput (tramp-compat-delete-file tmpinput 'force)) + (when tmpinput (tramp-compat-delete-file tmpinput)) ;; `process-file-side-effects' has been introduced with GNU ;; Emacs 23.2. If set to `nil', no remote file will be changed @@ -4666,7 +4666,7 @@ (when delete (delete-region start end)) (unwind-protect (apply 'call-process program tmpfile buffer display args) - (tramp-compat-delete-file tmpfile 'force)))) + (tramp-compat-delete-file tmpfile)))) (defun tramp-handle-shell-command (command &optional output-buffer error-buffer) @@ -4731,7 +4731,7 @@ (when (listp buffer) (with-current-buffer error-buffer (insert-file-contents (cadr buffer))) - (tramp-compat-delete-file (cadr buffer) 'force)) + (tramp-compat-delete-file (cadr buffer))) (if current-buffer-p ;; This is like exchange-point-and-mark, but doesn't ;; activate the mark. It is cleaner to avoid activation, @@ -4813,7 +4813,7 @@ (unwind-protect (tramp-call-local-coding-command loc-dec tmpfile2 tmpfile) - (tramp-compat-delete-file tmpfile2 'force))))) + (tramp-compat-delete-file tmpfile2))))) ;; Set proper permissions. (set-file-modes tmpfile (tramp-default-file-modes filename)) @@ -4826,7 +4826,7 @@ ;; Error handling. ((error quit) - (tramp-compat-delete-file tmpfile 'force) + (tramp-compat-delete-file tmpfile) (signal (car err) (cdr err)))) (run-hooks 'tramp-handle-file-local-copy-hook) @@ -4961,11 +4961,10 @@ (set-buffer-modified-p nil)) (when (and (stringp local-copy) (or remote-copy (null tramp-temp-buffer-file-name))) - (tramp-compat-delete-file local-copy 'force)) + (tramp-compat-delete-file local-copy)) (when (stringp remote-copy) (tramp-compat-delete-file - (tramp-make-tramp-file-name method user host remote-copy) - 'force))))) + (tramp-make-tramp-file-name method user host remote-copy)))))) ;; Result. (list (expand-file-name filename) @@ -5155,7 +5154,7 @@ (list start end tmpfile append 'no-message lockname confirm)) ((error quit) (setq tramp-temp-buffer-file-name nil) - (tramp-compat-delete-file tmpfile 'force) + (tramp-compat-delete-file tmpfile) (signal (car err) (cdr err)))) ;; Now, `last-coding-system-used' has the right value. Remember it. @@ -5199,13 +5198,13 @@ (copy-file tmpfile filename t) ((error quit) (setq tramp-temp-buffer-file-name nil) - (tramp-compat-delete-file tmpfile 'force) + (tramp-compat-delete-file tmpfile) (signal (car err) (cdr err))))) (setq tramp-temp-buffer-file-name nil) ;; Don't rename, in order to keep context in SELinux. (unwind-protect (copy-file tmpfile filename t) - (tramp-compat-delete-file tmpfile 'force)))) + (tramp-compat-delete-file tmpfile)))) ;; Use inline file transfer. (rem-dec @@ -5290,7 +5289,7 @@ filename rem-dec))))) ;; Save exit. - (tramp-compat-delete-file tmpfile 'force))) + (tramp-compat-delete-file tmpfile))) ;; That's not expected. (t @@ -6373,7 +6372,7 @@ "Remove temporary files related to current buffer." (when (stringp tramp-temp-buffer-file-name) (condition-case nil - (tramp-compat-delete-file tramp-temp-buffer-file-name 'force) + (tramp-compat-delete-file tramp-temp-buffer-file-name) (error nil)))) (add-hook 'kill-buffer-hook 'tramp-delete-temp-file-function)