diff options
| author | Chong Yidong <[email protected]> | 2010-05-03 11:01:21 -0400 |
|---|---|---|
| committer | Chong Yidong <[email protected]> | 2010-05-03 11:01:21 -0400 |
| commit | 53967e09ad89f11531c7fee0240c2eac1f63922c (patch) | |
| tree | c5442ddb118482959ce9e503ae48e71eb6758a52 /lisp/server.el | |
| parent | 1fada56353a7759495a3abb19d93235c040bccad (diff) | |
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/server.el')
| -rw-r--r-- | lisp/server.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/server.el b/lisp/server.el index 5681911263..6b5f248633 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -345,8 +345,7 @@ If CLIENT is non-nil, add a description of it to the logged message." (and (process-contact proc :server) (eq (process-status proc) 'closed) (ignore-errors - (let (delete-by-moving-to-trash) - (delete-file (process-get proc :server-file))))) + (delete-file (process-get proc :server-file) t))) (server-log (format "Status changed to %s: %s" (process-status proc) msg) proc) (server-delete-client proc)) |