diff options
author | Kim F. Storm <storm@cua.dk> | 2007-02-24 00:07:19 +0000 |
---|---|---|
committer | Kim F. Storm <storm@cua.dk> | 2007-02-24 00:07:19 +0000 |
commit | bb4c0f16cd632ec078eb8d47de597f2868da758f (patch) | |
tree | 006800979d8dbf853ef3b3ab21243cf9014c3b84 /lisp | |
parent | e026eb896c4109a93015bdc6b3bd8f3fc5ecddd5 (diff) | |
download | emacs-bb4c0f16cd632ec078eb8d47de597f2868da758f.tar.gz |
2007-02-24 Chris Moore <dooglus@gmail.com>
(pgg-*-encrypt-region):
Check pgg-encrypt-for-me if no other recipients.
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/pgg-gpg.el | 2 | ||||
-rw-r--r-- | lisp/pgg-pgp.el | 2 | ||||
-rw-r--r-- | lisp/pgg-pgp5.el | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el index a2cd14eaae3..014357aa4e6 100644 --- a/lisp/pgg-gpg.el +++ b/lisp/pgg-gpg.el @@ -224,7 +224,7 @@ passphrase cache or user." (list "--batch" "--armor" "--always-trust" "--encrypt") (if pgg-text-mode (list "--textmode")) (if sign (list "--sign" "--local-user" pgg-gpg-user-id)) - (if recipients + (if (or recipients pgg-encrypt-for-me) (apply #'nconc (mapcar (lambda (rcpt) (list pgg-gpg-recipient-argument rcpt)) diff --git a/lisp/pgg-pgp.el b/lisp/pgg-pgp.el index 1e1bd6d0fd1..9bc494a5ef7 100644 --- a/lisp/pgg-pgp.el +++ b/lisp/pgg-pgp.el @@ -143,7 +143,7 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"." (args (concat "+encrypttoself=off +verbose=1 +batchmode +language=us -fate " - (if recipients + (if (or recipients pgg-encrypt-for-me) (mapconcat 'shell-quote-argument (append recipients (if pgg-encrypt-for-me diff --git a/lisp/pgg-pgp5.el b/lisp/pgg-pgp5.el index b438843e73b..7525ee3d981 100644 --- a/lisp/pgg-pgp5.el +++ b/lisp/pgg-pgp5.el @@ -155,7 +155,7 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"." (args (append `("+NoBatchInvalidKeys=off" "-fat" "+batchmode=1" - ,@(if recipients + ,@(if (or recipients pgg-encrypt-for-me) (apply #'append (mapcar (lambda (rcpt) (list "-r" |