procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bind delete-by-moving-to-trash to nil in pgg-*.el.

Browse source 
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.
This commit is contained in:
Chong Yidong 2011-02-14 17:56:38 -05:00
parent 07ca555579
commit 35a7fb0b75
4 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lisp/ChangeLog
View file

@ -1,3 +1,13 @@
2011-02-14 Chong Yidong <cyd@stupidchicken.com>
* 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 <cyd@stupidchicken.com>
* files.el (copy-directory): Revert to pre-2011-01-29 version.

3
lisp/pgg-gpg.el
View file

@ -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)

13
lisp/pgg-pgp.el
View file

@ -108,7 +108,8 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
(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 @@ passphrase cache or user."
(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 @@ passphrase cache or user."
(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)

13
lisp/pgg-pgp5.el
View file

@ -124,7 +124,8 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
(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 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
(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 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
(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)