*** pgg-gpg.el.orig	Sun Dec  7 09:09:01 2003
--- pgg-gpg.el	Sun Dec  7 10:11:05 2003
***************
*** 43,48 ****
--- 43,54 ----
    :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,160 ****
  	   (if recipients
  	       (apply #'nconc
  		      (mapcar (lambda (rcpt)
! 				(list "--remote-user" rcpt))
  			      (append recipients
  				      (if pgg-encrypt-for-me
  					  (list pgg-gpg-user-id)))))))))
--- 160,166 ----
  	   (if recipients
  	       (apply #'nconc
  		      (mapcar (lambda (rcpt)
! 				(list pgg-gpg-recipient-arg rcpt))
  			      (append recipients
  				      (if pgg-encrypt-for-me
  					  (list pgg-gpg-user-id)))))))))