Mercurial > emacs
diff lisp/jka-compr.el @ 108183:b67d7273ec18
Avoid using trash for certain temp files (Bug#6070).
* server.el (server-sentinel, server-start, server-force-delete):
* jka-compr.el (jka-compr-partial-uncompress)
(jka-compr-call-process, jka-compr-write-region, jka-compr-load):
* epg.el (epg--make-temp-file, epg-decrypt-string)
(epg-encrypt-string, epg-verify-string, epg-sign-string):
* diff.el (diff-sentinel): Bind delete-by-moving-to-trash to nil
before deleting (Bug#6070).
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Fri, 30 Apr 2010 22:19:40 -0400 |
parents | 89c890863220 |
children | 261591829d04 |
line wrap: on
line diff
--- a/lisp/jka-compr.el Fri Apr 30 21:39:58 2010 -0400 +++ b/lisp/jka-compr.el Fri Apr 30 22:19:40 2010 -0400 @@ -181,7 +181,9 @@ null-device)) jka-compr-acceptable-retval-list) (jka-compr-error prog args infile message err-file)) - (jka-compr-delete-temp-file err-file))) + (let (delete-by-moving-to-trash) + (delete-file err-file)))) + ;; Run the uncompression program directly. ;; We get the whole file and must delete what we don't want. (jka-compr-call-process prog message infile t nil args)) @@ -222,7 +224,8 @@ ""))) jka-compr-acceptable-retval-list) (jka-compr-error prog args infile message err-file)) - (jka-compr-delete-temp-file err-file))) + (let (delete-by-moving-to-trash) + (delete-file err-file)))) (or (eq 0 (apply 'call-process prog infile (if (stringp output) temp output) @@ -248,9 +251,6 @@ "This routine will return the name of a new file." (make-temp-file jka-compr-temp-name-template)) -(defalias 'jka-compr-delete-temp-file 'delete-file) - - (defun jka-compr-write-region (start end file &optional append visit) (let* ((filename (expand-file-name file)) (visit-file (if (stringp visit) (expand-file-name visit) filename)) @@ -337,7 +337,8 @@ (and append can-append) 'dont)) (erase-buffer)) ) - (jka-compr-delete-temp-file temp-file) + (let (delete-by-moving-to-trash) + (delete-file temp-file)) (and compress-message @@ -603,7 +604,8 @@ (setq file (file-name-sans-extension file))) (setcar l file))) - (jka-compr-delete-temp-file local-copy)) + (let (delete-by-moving-to-trash) + (delete-file local-copy))) t))