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/diff.el | |
| parent | 1fada56353a7759495a3abb19d93235c040bccad (diff) | |
| download | emacs-53967e09ad89f11531c7fee0240c2eac1f63922c.tar.gz emacs-53967e09ad89f11531c7fee0240c2eac1f63922c.tar.bz2 emacs-53967e09ad89f11531c7fee0240c2eac1f63922c.zip | |
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/diff.el')
| -rw-r--r-- | lisp/diff.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/diff.el b/lisp/diff.el index 37e52baaaac..d7fc993ec33 100644 --- a/lisp/diff.el +++ b/lisp/diff.el @@ -64,9 +64,8 @@ "Code run when the diff process exits. CODE is the exit code of the process. It should be 0 only if no diffs were found." - (let (delete-by-moving-to-trash) - (if diff-old-temp-file (delete-file diff-old-temp-file)) - (if diff-new-temp-file (delete-file diff-new-temp-file))) + (if diff-old-temp-file (delete-file diff-old-temp-file t)) + (if diff-new-temp-file (delete-file diff-new-temp-file t)) (save-excursion (goto-char (point-max)) (let ((inhibit-read-only t)) |