diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-04-30 22:19:40 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-04-30 22:19:40 -0400 |
| commit | 84716442f070dbf91fd3a1db173e130b78de561a (patch) | |
| tree | ffc06855643a2a6a3566bdd48a9f0580f60f1708 /lisp/diff.el | |
| parent | 07125a915e33a3a5cadea27f3f43647969ebf496 (diff) | |
| download | emacs-84716442f070dbf91fd3a1db173e130b78de561a.tar.gz | |
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).
Diffstat (limited to 'lisp/diff.el')
| -rw-r--r-- | lisp/diff.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/diff.el b/lisp/diff.el index 0206c17e770..37e52baaaac 100644 --- a/lisp/diff.el +++ b/lisp/diff.el @@ -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)) |