diff lisp/diff.el @ 108183:b67d7273ec18

Avoid using trash for certain temp files (Bug#6070). * server.el (server-sentinel, server-start, server-force-delete): * jka-compr.el (jka-compr-partial-uncompress) (jka-compr-call-process, jka-compr-write-region, jka-compr-load): * epg.el (epg--make-temp-file, epg-decrypt-string) (epg-encrypt-string, epg-verify-string, epg-sign-string): * diff.el (diff-sentinel): Bind delete-by-moving-to-trash to nil before deleting (Bug#6070).

--- a/lisp/diff.el	Fri Apr 30 21:39:58 2010 -0400
+++ b/lisp/diff.el	Fri Apr 30 22:19:40 2010 -0400
@@ -64,8 +64,9 @@
   "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."
-  (if diff-old-temp-file (delete-file diff-old-temp-file))
-  (if diff-new-temp-file (delete-file diff-new-temp-file))
+  (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)))
   (save-excursion
     (goto-char (point-max))
     (let ((inhibit-read-only t))