2 files changed, 9 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6ad7c939bce..6ee440f4cf2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-03  Ken Raeburn  <raeburn@mit.edu>
+
+        * callproc.c (delete_temp_file): Bind file-name-handler-alist to
+        nil for the call to internal_delete_file.
+
 2006-01-01  Ken Raeburn  <raeburn@gnu.org>
 
         * callproc.c (Fcall_process_region): Bind file-name-handler-alist
diff --git a/src/callproc.c b/src/callproc.c
index a9b9d2bff6a..b0fe16e70b8 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1013,9 +1013,11 @@ static Lisp_Object
 delete_temp_file (name)
      Lisp_Object name;
 {
-  /* Use Fdelete_file (indirectly) because that runs a file name handler.
-     We did that when writing the file, so we should do so when deleting.  */
+  /* Suppress jka-compr handling, etc.  */
+  int count = SPECPDL_INDEX ();
+  specbind (intern ("file-name-handler-alist"), Qnil);
   internal_delete_file (name);
+  unbind_to (count, Qnil);
   return Qnil;
 }