[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100472: Bind delete-by-moving-to-trash to nil in pgg-*.el.

[Chong Yidong]

------------------------------------------------------------
revno: 100472
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Mon 2011-02-14 17:56:38 -0500
message:
  Bind delete-by-moving-to-trash to nil in pgg-*.el.
  
  This change should not be merged into the trunk.
  
  * pgg-gpg.el (pgg-gpg-process-region): Bind
  delete-by-moving-to-trash to nil.
  
  * pgg-pgp.el (pgg-pgp-process-region, pgg-pgp-verify-region)
  (pgg-pgp-snarf-keys-region):
  * pgg-pgp5.el (pgg-pgp5-process-region, pgg-pgp5-verify-region)
  (pgg-pgp5-snarf-keys-region): Likewise.
modified:
  lisp/ChangeLog
  lisp/pgg-gpg.el
  lisp/pgg-pgp.el
  lisp/pgg-pgp5.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-02-12 19:43:04 +0000
+++ b/lisp/ChangeLog    2011-02-14 22:56:38 +0000
@@ -1,3 +1,13 @@
+2011-02-14  Chong Yidong  <address@hidden>
+
+       * pgg-gpg.el (pgg-gpg-process-region): Bind
+       delete-by-moving-to-trash to nil.
+
+       * pgg-pgp.el (pgg-pgp-process-region, pgg-pgp-verify-region)
+       (pgg-pgp-snarf-keys-region):
+       * pgg-pgp5.el (pgg-pgp5-process-region, pgg-pgp5-verify-region)
+       (pgg-pgp5-snarf-keys-region): Likewise.
+
 2011-02-12  Chong Yidong  <address@hidden>
 
        * files.el (copy-directory): Revert to pre-2011-01-29 version.

=== modified file 'lisp/pgg-gpg.el'
--- a/lisp/pgg-gpg.el   2011-01-02 23:50:46 +0000
+++ b/lisp/pgg-gpg.el   2011-02-14 22:56:38 +0000
@@ -130,7 +130,8 @@
       (if (and process (eq 'run (process-status process)))
          (interrupt-process process))
       (if (file-exists-p output-file-name)
-         (delete-file output-file-name))
+         (let ((delete-by-moving-to-trash nil))
+           (delete-file output-file-name)))
       (set-default-file-modes orig-mode))))
 
 (defun pgg-gpg-possibly-cache-passphrase (passphrase &optional key notruncate)

=== modified file 'lisp/pgg-pgp.el'
--- a/lisp/pgg-pgp.el   2011-01-02 23:50:46 +0000
+++ b/lisp/pgg-pgp.el   2011-02-14 22:56:38 +0000
@@ -108,7 +108,8 @@
       (if (and process (eq 'run (process-status process)))
          (interrupt-process process))
       (condition-case nil
-         (delete-file errors-file-name)
+         (let ((delete-by-moving-to-trash nil))
+           (delete-file errors-file-name))
        (file-error nil)))))
 
 (defun pgg-pgp-lookup-key (string &optional type)
@@ -215,8 +216,11 @@
          (setq args (concat args " " (shell-quote-argument signature)))))
     (setq args (concat args " " (shell-quote-argument orig-file)))
     (pgg-pgp-process-region (point)(point) nil pgg-pgp-program args)
-    (delete-file orig-file)
-    (if signature (delete-file signature))
+    (let ((delete-by-moving-to-trash nil))
+      (delete-file orig-file))
+    (if signature
+       (let ((delete-by-moving-to-trash nil))
+         (delete-file signature)))
     (pgg-process-when-success
       (goto-char (point-min))
       (let ((case-fold-search t))
@@ -248,7 +252,8 @@
     (let ((coding-system-for-write 'raw-text-dos))
       (write-region start end key-file))
     (pgg-pgp-process-region start end nil pgg-pgp-program args)
-    (delete-file key-file)
+    (let ((delete-by-moving-to-trash nil))
+      (delete-file key-file))
     (pgg-process-when-success nil)))
 
 (provide 'pgg-pgp)

=== modified file 'lisp/pgg-pgp5.el'
--- a/lisp/pgg-pgp5.el  2011-01-02 23:50:46 +0000
+++ b/lisp/pgg-pgp5.el  2011-02-14 22:56:38 +0000
@@ -124,7 +124,8 @@
       (if (and process (eq 'run (process-status process)))
          (interrupt-process process))
       (condition-case nil
-         (delete-file errors-file-name)
+         (let ((delete-by-moving-to-trash nil))
+           (delete-file errors-file-name))
        (file-error nil)))))
 
 (defun pgg-pgp5-lookup-key (string &optional type)
@@ -219,8 +220,11 @@
       (copy-file signature (setq signature (concat orig-file ".asc")))
       (setq args (append args (list signature))))
     (pgg-pgp5-process-region (point)(point) nil pgg-pgp5-pgpv-program args)
-    (delete-file orig-file)
-    (if signature (delete-file signature))
+    (let ((delete-by-moving-to-trash nil))
+      (delete-file orig-file))
+    (if signature
+       (let ((delete-by-moving-to-trash nil))
+         (delete-file signature)))
     (with-current-buffer pgg-errors-buffer
       (goto-char (point-min))
       (if (re-search-forward "^Good signature" nil t)
@@ -249,7 +253,8 @@
     (let ((coding-system-for-write 'raw-text-dos))
       (write-region start end key-file))
     (pgg-pgp5-process-region start end nil pgg-pgp5-pgpk-program args)
-    (delete-file key-file)
+    (let ((delete-by-moving-to-trash nil))
+      (delete-file key-file))
     (pgg-process-when-success nil)))
 
 (provide 'pgg-pgp5)