[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100464: Bind delete-by-moving-to-trash to nil in EPA and EPG.

[Chong Yidong]

------------------------------------------------------------
revno: 100464
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Fri 2011-02-11 19:21:25 -0500
message:
  Bind delete-by-moving-to-trash to nil in EPA and EPG.
  This should not be merged into the trunk.
  
  * epa-file.el (epa-file-insert-file-contents): Likewise.
  
  * 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.
modified:
  lisp/ChangeLog
  lisp/epa-file.el
  lisp/epg.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-02-10 05:07:32 +0000
+++ b/lisp/ChangeLog    2011-02-12 00:21:25 +0000
@@ -1,3 +1,11 @@
+2011-02-12  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * emacs-lisp/cl-seq.el (union, nunion, intersection)

=== modified file 'lisp/epa-file.el'
--- a/lisp/epa-file.el  2011-01-02 23:50:46 +0000
+++ b/lisp/epa-file.el  2011-02-12 00:21:25 +0000
@@ -149,7 +149,8 @@
                (set-visited-file-modtime))))
       (if (and local-copy
               (file-exists-p local-copy))
-         (delete-file local-copy)))
+         (let ((delete-by-moving-to-trash nil))
+           (delete-file local-copy))))
     (list file length)))
 (put 'insert-file-contents 'epa-file 'epa-file-insert-file-contents)
 

=== modified file 'lisp/epg.el'
--- a/lisp/epg.el       2011-02-02 07:53:29 +0000
+++ b/lisp/epg.el       2011-02-12 00:21:25 +0000
@@ -1215,7 +1215,8 @@
   "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)
@@ -1904,7 +1905,8 @@
          ;; 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)
@@ -2004,7 +2006,8 @@
          (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)
@@ -2101,7 +2104,8 @@
       (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)
@@ -2208,7 +2212,8 @@
          (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
@@ -2328,7 +2333,8 @@
          (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)