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).

1 files changed, 5 insertions, 10 deletions

diff --git a/lisp/epg.el b/lisp/epg.el
index 668043ebeb7..7791c1865a7 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -1898,8 +1898,7 @@ You can then use `write-region' to write new data into the file."
 	  ;; Cleanup the tempfile.
 	  (and tempfile
 	       (file-exists-p tempfile)
-	       (let (delete-by-moving-to-trash)
-		 (delete-file tempfile)))
+	       (delete-file tempfile t))
 	  ;; Cleanup the tempdir.
 	  (and tempdir
 	       (file-directory-p tempdir)
@@ -1999,8 +1998,7 @@ If PLAIN is nil, it returns the result as a string."
 	  (epg-read-output context))
       (epg-delete-output-file context)
       (if (file-exists-p input-file)
-	  (let (delete-by-moving-to-trash)
-	    (delete-file input-file)))
+	  (delete-file input-file t))
       (epg-reset context))))
 
 (defun epg-start-verify (context signature &optional signed-text)
@@ -2097,8 +2095,7 @@ successful verification."
       (epg-delete-output-file context)
       (if (and input-file
 	       (file-exists-p input-file))
-	  (let (delete-by-moving-to-trash)
-	    (delete-file input-file)))
+	  (delete-file input-file))
       (epg-reset context))))
 
 (defun epg-start-sign (context plain &optional mode)
@@ -2205,8 +2202,7 @@ Otherwise, it makes a cleartext signature."
 	  (epg-read-output context))
       (epg-delete-output-file context)
       (if input-file
-	  (let (delete-by-moving-to-trash)
-	    (delete-file input-file)))
+	  (delete-file input-file t))
       (epg-reset context))))
 
 (defun epg-start-encrypt (context plain recipients
@@ -2326,8 +2322,7 @@ If RECIPIENTS is nil, it performs symmetric encryption."
 	  (epg-read-output context))
       (epg-delete-output-file context)
       (if input-file
-	  (let (delete-by-moving-to-trash)
-	    (delete-file input-file)))
+	  (delete-file input-file t))
       (epg-reset context))))
 
 (defun epg-start-export-keys (context keys)