(pgg-gpg-recipient-arg): Add.

(pgg-gpg-encrypt-region): Use it.  Tiny patch from Lloyd Zusman
<ljz@asfast.com>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 58ee59b..a861544 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-07  Simon Josefsson  <jas@extundo.com>
+
+       * pgg-gpg.el (pgg-gpg-recipient-arg): Add.
+       (pgg-gpg-encrypt-region): Use it.  Tiny patch from Lloyd Zusman
+       <ljz@asfast.com>.
+
 2003-12-07  Jesper Harder  <harder@ifa.au.dk>
 
        * spam.el (spam-check-spamoracle, spam-spamoracle-learn): Don't

diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el
index c6efe28..f1ba7cb 100644 (file)
--- a/lisp/pgg-gpg.el
+++ b/lisp/pgg-gpg.el
@@ -43,6 +43,12 @@
   :group 'pgg-gpg
   :type '(repeat (string :tag "Argument")))
 
+(defcustom pgg-gpg-recipient-arg "--recipient"
+  "Recipient option for gpg."
+  :group 'pgg-gpg
+  :type '(choice (const :tag "New `--recipient' option" "--recipient")
+                (const :tag "Old `--remote-user' option" "--remote-user")))
+
 (defvar pgg-gpg-user-id nil
   "GnuPG ID of your default identity.")
 
@@ -154,7 +160,7 @@ If optional argument SIGN is non-nil, do a combined sign and encrypt."
           (if recipients
               (apply #'nconc
                      (mapcar (lambda (rcpt)
-                               (list "--remote-user" rcpt))
+                               (list pgg-gpg-recipient-arg rcpt))
                              (append recipients
                                      (if pgg-encrypt-for-me
                                          (list pgg-gpg-user-id)))))))))