aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim F. Storm2007-02-24 00:07:19 +0000
committerKim F. Storm2007-02-24 00:07:19 +0000
commitbb4c0f16cd632ec078eb8d47de597f2868da758f (patch)
tree006800979d8dbf853ef3b3ab21243cf9014c3b84
parente026eb896c4109a93015bdc6b3bd8f3fc5ecddd5 (diff)
downloademacs-bb4c0f16cd632ec078eb8d47de597f2868da758f.tar.gz
emacs-bb4c0f16cd632ec078eb8d47de597f2868da758f.zip
2007-02-24 Chris Moore <dooglus@gmail.com>
(pgg-*-encrypt-region): Check pgg-encrypt-for-me if no other recipients.
-rw-r--r--lisp/pgg-gpg.el2
-rw-r--r--lisp/pgg-pgp.el2
-rw-r--r--lisp/pgg-pgp5.el2
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."
224 (list "--batch" "--armor" "--always-trust" "--encrypt") 224 (list "--batch" "--armor" "--always-trust" "--encrypt")
225 (if pgg-text-mode (list "--textmode")) 225 (if pgg-text-mode (list "--textmode"))
226 (if sign (list "--sign" "--local-user" pgg-gpg-user-id)) 226 (if sign (list "--sign" "--local-user" pgg-gpg-user-id))
227 (if recipients 227 (if (or recipients pgg-encrypt-for-me)
228 (apply #'nconc 228 (apply #'nconc
229 (mapcar (lambda (rcpt) 229 (mapcar (lambda (rcpt)
230 (list pgg-gpg-recipient-argument rcpt)) 230 (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>\"."
143 (args 143 (args
144 (concat 144 (concat
145 "+encrypttoself=off +verbose=1 +batchmode +language=us -fate " 145 "+encrypttoself=off +verbose=1 +batchmode +language=us -fate "
146 (if recipients 146 (if (or recipients pgg-encrypt-for-me)
147 (mapconcat 'shell-quote-argument 147 (mapconcat 'shell-quote-argument
148 (append recipients 148 (append recipients
149 (if pgg-encrypt-for-me 149 (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>\"."
155 (args 155 (args
156 (append 156 (append
157 `("+NoBatchInvalidKeys=off" "-fat" "+batchmode=1" 157 `("+NoBatchInvalidKeys=off" "-fat" "+batchmode=1"
158 ,@(if recipients 158 ,@(if (or recipients pgg-encrypt-for-me)
159 (apply #'append 159 (apply #'append
160 (mapcar (lambda (rcpt) 160 (mapcar (lambda (rcpt)
161 (list "-r" 161 (list "-r"