(mml2015-epg-encrypt): Save the recipient keys in message-options.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c4b10dc..618315f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,12 +2,12 @@
 
        * mml2015.el (mml2015-epg-sign): Save the signing keys in
        message-options.
 
        * mml2015.el (mml2015-epg-sign): Save the signing keys in
        message-options.

+       (mml2015-epg-encrypt): Save the recipient keys in message-options.

 
 2006-11-13  Daiki Ueno  <ueno@unixuser.org>
 
        * mml2015.el (mml2015-epg-encrypt): Removed backward compatibility for
        EasyPG (< 0.0.6).
 
 2006-11-13  Daiki Ueno  <ueno@unixuser.org>
 
        * mml2015.el (mml2015-epg-encrypt): Removed backward compatibility for
        EasyPG (< 0.0.6).

-       (mml2015-encrypt-to-self): Turn on by default.

        (mml2015-always-trust): New user option.
        (mml2015-epg-passphrase-callback): Display key ID on the passphrase
        prompt.
        (mml2015-always-trust): New user option.
        (mml2015-epg-passphrase-callback): Display key ID on the passphrase
        prompt.

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 5372056..b1dc1c0 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -131,7 +131,7 @@ Whether the passphrase is cached at all is controlled by
   :group 'mime-security
   :type '(repeat (string :tag "Key ID")))
 
   :group 'mime-security
   :type '(repeat (string :tag "Key ID")))
 

-(defcustom mml2015-encrypt-to-self t
+(defcustom mml2015-encrypt-to-self nil

   "If t, add your own key ID to recipient list when encryption."
   :group 'mime-security
   :type 'boolean)
   "If t, add your own key ID to recipient list when encryption."
   :group 'mime-security
   :type 'boolean)


@@ -1180,45 +1180,54 @@ If no one is selected, default secret key is used.  "
   (let ((inhibit-redisplay t)
        (context (epg-make-context))
        (config (epg-configuration))
   (let ((inhibit-redisplay t)
        (context (epg-make-context))
        (config (epg-configuration))

-       (recipients (split-string
+       (recipients (message-options-get 'mml2015-epg-recipients))
+       cipher signers
+       (boundary (mml-compute-boundary cont)))
+    (unless recipients
+      (setq recipients
+           (apply #'nconc
+                  (mapcar
+                   (lambda (recipient)
+                     (or (epg-expand-group config recipient)
+                         (list recipient)))
+                   (split-string

                     (or (message-options-get 'message-recipients)
                         (message-options-set 'message-recipients
                                              (read-string "Recipients: ")))
                     (or (message-options-get 'message-recipients)
                         (message-options-set 'message-recipients
                                              (read-string "Recipients: ")))

-                    "[ \f\t\n\r\v,]+"))
-       cipher signers
-       (boundary (mml-compute-boundary cont)))
-    (setq recipients (apply #'nconc
-                           (mapcar
-                            (lambda (recipient)
-                              (or (epg-expand-group config recipient)
-                                  (list recipient)))
-                            recipients)))
-    (if mml2015-verbose
-       (setq recipients
-             (epa-select-keys context "Select recipients for encryption.
+                    "[ \f\t\n\r\v,]+"))))
+      (if mml2015-verbose
+         (setq recipients
+               (epa-select-keys context "\
+Select recipients for encryption.

 If no one is selected, symmetric encryption will be performed.  "
 If no one is selected, symmetric encryption will be performed.  "

-                              recipients))
-      (setq recipients
-           (delq nil (mapcar (lambda (name)
-                               (car (epg-list-keys context name)))
-                             recipients))))
-    (if mml2015-encrypt-to-self
-       (if mml2015-signers
-           (setq recipients
-                 (nconc recipients
-                        (mapcar (lambda (name)
-                                  (car (epg-list-keys context name)))
-                                mml2015-signers)))
-         (error "mml2015-signers not set")))
+                                recipients))
+       (setq recipients
+             (delq nil (mapcar (lambda (name)
+                                 (car (epg-list-keys context name)))
+                               recipients))))
+      (if mml2015-encrypt-to-self
+         (if mml2015-signers
+             (setq recipients
+                   (nconc recipients
+                          (mapcar (lambda (name)
+                                    (car (epg-list-keys context name)))
+                                  mml2015-signers)))
+           (error "mml2015-signers not set")))
+      (message-options-set 'message-recipients recipients))

     (when sign
     (when sign

-      (if mml2015-verbose
-         (setq signers (epa-select-keys context "Select keys for signing.
+      (setq signers
+           (or (message-options-get 'mml2015-epg-signers)
+               (message-options-set
+                'mml2015-epg-signers
+                (if mml2015-verbose
+                    (epa-select-keys context "\
+Select keys for signing.

 If no one is selected, default secret key is used.  "
 If no one is selected, default secret key is used.  "

-                                        mml2015-signers t))
-       (if mml2015-signers
-           (setq signers (mapcar (lambda (name)
-                                   (car (epg-list-keys context name t)))
-                                 mml2015-signers))))
+                                     mml2015-signers t)
+                  (if mml2015-signers
+                      (mapcar (lambda (name)
+                                (car (epg-list-keys context name t)))
+                              mml2015-signers))))))

       (epg-context-set-signers context signers))
     (epg-context-set-armor context t)
     (epg-context-set-textmode context t)
       (epg-context-set-signers context signers))
     (epg-context-set-armor context t)
     (epg-context-set-textmode context t)