diff options
| author | Miles Bader <miles@gnu.org> | 2006-06-07 16:39:16 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-06-07 16:39:16 +0000 |
| commit | 26c9afc3239e18b03537faaea33e3e82e28099e6 (patch) | |
| tree | 41efa20fcb13fa610ca48a497f9adc8a1b849b6b /lisp/pgg-pgp.el | |
| parent | 3f168e293115114a645fd9ac9fa8855a21ade478 (diff) | |
| download | emacs-26c9afc3239e18b03537faaea33e3e82e28099e6.tar.gz emacs-26c9afc3239e18b03537faaea33e3e82e28099e6.tar.bz2 emacs-26c9afc3239e18b03537faaea33e3e82e28099e6.zip | |
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 103-104)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-295
Diffstat (limited to 'lisp/pgg-pgp.el')
| -rw-r--r-- | lisp/pgg-pgp.el | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/lisp/pgg-pgp.el b/lisp/pgg-pgp.el index f58fd0d3c6d..e53a0c2c867 100644 --- a/lisp/pgg-pgp.el +++ b/lisp/pgg-pgp.el @@ -136,21 +136,21 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"." "Encrypt the current region between START and END." (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id)) (passphrase (or passphrase - (when sign - (pgg-read-passphrase - (format "PGP passphrase for %s: " - pgg-pgp-user-id) - pgg-pgp-user-id)))) + (when sign + (pgg-read-passphrase + (format "PGP passphrase for %s: " + pgg-pgp-user-id) + pgg-pgp-user-id)))) (args - (append - `("+encrypttoself=off +verbose=1" "+batchmode" - "+language=us" "-fate" - ,@(if recipients - (mapcar (lambda (rcpt) (concat "\"" rcpt "\"")) - (append recipients - (if pgg-encrypt-for-me - (list pgg-pgp-user-id)))))) - (if sign '("-s" "-u" pgg-pgp-user-id))))) + (append + `("+encrypttoself=off +verbose=1" "+batchmode" + "+language=us" "-fate" + ,@(if recipients + (mapcar (lambda (rcpt) (concat "\"" rcpt "\"")) + (append recipients + (if pgg-encrypt-for-me + (list pgg-pgp-user-id)))))) + (if sign '("-s" "-u" pgg-pgp-user-id))))) (pgg-pgp-process-region start end nil pgg-pgp-program args) (pgg-process-when-success nil))) @@ -162,11 +162,11 @@ passphrase cache or user." (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id)) (key (pgg-pgp-lookup-key pgg-pgp-user-id 'encrypt)) (passphrase - (or passphrase - (pgg-read-passphrase - (format "PGP passphrase for %s: " pgg-pgp-user-id) key))) + (or passphrase + (pgg-read-passphrase + (format "PGP passphrase for %s: " pgg-pgp-user-id) key))) (args - '("+verbose=1" "+batchmode" "+language=us" "-f"))) + '("+verbose=1" "+batchmode" "+language=us" "-f"))) (pgg-pgp-process-region start end passphrase pgg-pgp-program args) (pgg-process-when-success (if pgg-cache-passphrase @@ -179,10 +179,10 @@ If optional PASSPHRASE is not specified, it will be obtained from the passphrase cache or user." (let* ((pgg-pgp-user-id (or pgg-pgp-user-id pgg-default-user-id)) (passphrase - (or passphrase - (pgg-read-passphrase - (format "PGP passphrase for %s: " pgg-pgp-user-id) - (pgg-pgp-lookup-key pgg-pgp-user-id 'sign)))) + (or passphrase + (pgg-read-passphrase + (format "PGP passphrase for %s: " pgg-pgp-user-id) + (pgg-pgp-lookup-key pgg-pgp-user-id 'sign)))) (args (list (if clearsign "-fast" "-fbast") "+verbose=1" "+language=us" "+batchmode" |