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, 16 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e14f7de13a6..3a9a9ca2264 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2010-05-03  Chong Yidong  <cyd@stupidchicken.com>
+
+        * 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.
+
 2010-05-03  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (LIBX_EXTRA, LIBX_BASE): New variables.