Mercurial > emacs
diff src/callproc.c @ 90261:7beb78bc1f8e
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-97
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 616-696)
- Add lisp/mh-e/.arch-inventory
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: lisp/smerge-mode.el: Add 'tools' to file keywords.
- lisp/gnus/ChangeLog: Remove duplicate entry
* gnus--rel--5.10 (patch 147-181)
- Update from CVS
- Merge from emacs--cvs-trunk--0
- Update from CVS: lisp/mml.el (mml-preview): Doc fix.
- Update from CVS: texi/message.texi: Fix default values.
- Update from CVS: texi/gnus.texi (RSS): Addition.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 16 Jan 2006 08:37:27 +0000 |
parents | 2d92f5c9d6ae d7475f0d0bda |
children | 7432ca837c8d |
line wrap: on
line diff
--- a/src/callproc.c Mon Jan 16 06:59:21 2006 +0000 +++ b/src/callproc.c Mon Jan 16 08:37:27 2006 +0000 @@ -896,9 +896,11 @@ 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; } @@ -1009,6 +1011,9 @@ int count1 = SPECPDL_INDEX (); specbind (intern ("coding-system-for-write"), val); + /* POSIX lets mk[s]temp use "."; don't invoke jka-compr if we + happen to get a ".Z" suffix. */ + specbind (intern ("file-name-handler-alist"), Qnil); Fwrite_region (start, end, filename_string, Qnil, Qlambda, Qnil, Qnil); unbind_to (count1, Qnil);