+2011-02-12 Chong Yidong <cyd@stupidchicken.com>
+
+ * epg.el (epg-delete-output-file, epg-decrypt-string)
+ (epg-verify-string, epg-sign-string, epg-encrypt-string): Bind
+ delete-by-moving-to-trash to nil.
+
+ * epa-file.el (epa-file-insert-file-contents): Likewise.
+
2011-02-10 Glenn Morris <rgm@gnu.org>
* emacs-lisp/cl-seq.el (union, nunion, intersection)
"Delete the output file of CONTEXT."
(if (and (epg-context-output-file context)
(file-exists-p (epg-context-output-file context)))
- (delete-file (epg-context-output-file context))))
+ (let ((delete-by-moving-to-trash nil))
+ (delete-file (epg-context-output-file context)))))
(eval-and-compile
(if (fboundp 'decode-coding-string)
;; Cleanup the tempfile.
(and tempfile
(file-exists-p tempfile)
- (delete-file tempfile))
+ (let ((delete-by-moving-to-trash nil))
+ (delete-file tempfile)))
;; Cleanup the tempdir.
(and tempdir
(file-directory-p tempdir)
(epg-read-output context))
(epg-delete-output-file context)
(if (file-exists-p input-file)
- (delete-file input-file))
+ (let ((delete-by-moving-to-trash nil))
+ (delete-file input-file)))
(epg-reset context))))
(defun epg-start-verify (context signature &optional signed-text)
(epg-delete-output-file context)
(if (and input-file
(file-exists-p input-file))
- (delete-file input-file))
+ (let ((delete-by-moving-to-trash nil))
+ (delete-file input-file)))
(epg-reset context))))
(defun epg-start-sign (context plain &optional mode)
(epg-read-output context))
(epg-delete-output-file context)
(if input-file
- (delete-file input-file))
+ (let ((delete-by-moving-to-trash nil))
+ (delete-file input-file)))
(epg-reset context))))
(defun epg-start-encrypt (context plain recipients
(epg-read-output context))
(epg-delete-output-file context)
(if input-file
- (delete-file input-file))
+ (let ((delete-by-moving-to-trash nil))
+ (delete-file input-file)))
(epg-reset context))))
(defun epg-start-export-keys (context keys)