diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-05-03 11:01:21 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-05-03 11:01:21 -0400 |
| commit | 53967e09ad89f11531c7fee0240c2eac1f63922c (patch) | |
| tree | c5442ddb118482959ce9e503ae48e71eb6758a52 /lisp/jka-compr.el | |
| parent | 1fada56353a7759495a3abb19d93235c040bccad (diff) | |
| download | emacs-53967e09ad89f11531c7fee0240c2eac1f63922c.tar.gz | |
Add optional arg to delete-file to force deletion (Bug#6070).
* eval.c (internal_condition_case_n): Rename from
internal_condition_case_2.
(internal_condition_case_2): New function.
* xdisp.c (safe_call): Use internal_condition_case_n.
* fileio.c (Fdelete_file, internal_delete_file): New arg FORCE.
(internal_delete_file, Frename_file): Callers changed.
* buffer.c (Fkill_buffer):
* callproc.c (delete_temp_file): Callers changed (Bug#6070).
* lisp.h: Update prototypes.
* diff.el (diff-sentinel):
* epg.el (epg--make-temp-file, epg-decrypt-string)
(epg-verify-string, epg-sign-string, epg-encrypt-string):
* jka-compr.el (jka-compr-partial-uncompress)
(jka-compr-call-process, jka-compr-write-region, jka-compr-load):
* server.el (server-sentinel): Use delete-file's new FORCE arg
(Bug#6070).
Diffstat (limited to 'lisp/jka-compr.el')
| -rw-r--r-- | lisp/jka-compr.el | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el index 6df57d710e1..e4311e13f28 100644 --- a/lisp/jka-compr.el +++ b/lisp/jka-compr.el @@ -181,8 +181,7 @@ to keep: LEN chars starting BEG chars from the beginning." null-device)) jka-compr-acceptable-retval-list) (jka-compr-error prog args infile message err-file)) - (let (delete-by-moving-to-trash) - (delete-file err-file)))) + (delete-file err-file t))) ;; Run the uncompression program directly. ;; We get the whole file and must delete what we don't want. @@ -224,8 +223,7 @@ to keep: LEN chars starting BEG chars from the beginning." ""))) jka-compr-acceptable-retval-list) (jka-compr-error prog args infile message err-file)) - (let (delete-by-moving-to-trash) - (delete-file err-file)))) + (delete-file err-file t))) (or (eq 0 (apply 'call-process prog infile (if (stringp output) temp output) @@ -337,8 +335,7 @@ There should be no more than seven characters after the final `/'." (and append can-append) 'dont)) (erase-buffer)) ) - (let (delete-by-moving-to-trash) - (delete-file temp-file)) + (delete-file temp-file t) (and compress-message @@ -604,8 +601,7 @@ There should be no more than seven characters after the final `/'." (setq file (file-name-sans-extension file))) (setcar l file))) - (let (delete-by-moving-to-trash) - (delete-file local-copy))) + (delete-file local-copy)) t)) |