* mml-smime.el (mml-smime-epg-sign, mml-smime-epg-encrypt): Ditto.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4b6965b..6427a24 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-22  Daiki Ueno  <ueno@unixuser.org>
+
+       * mm-decode.el (mm-sign-option): New user option.
+       * mml2015.el (mml2015-epg-sign, mml2015-epg-encrypt): Let users select
+       signing keys if mm-sign-option is 'guided.
+       * mml-smime.el (mml-smime-epg-sign, mml-smime-epg-encrypt): Ditto.
+
 2009-09-15  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-article-edit-part): Work for the buffer

diff --git a/lisp/mml-smime.el b/lisp/mml-smime.el
index af4d1bf..bf4ac6f 100644 (file)
--- a/lisp/mml-smime.el
+++ b/lisp/mml-smime.el
@@ -381,7 +381,7 @@ Whether the passphrase is cached at all is controlled by
          (or (message-options-get 'mml-smime-epg-signers)
              (message-options-set
              'mml-smime-epg-signers
-             (if mml-smime-verbose
+             (if (eq mm-sign-option 'guided)
                  (epa-select-keys context "\
 Select keys for signing.
 If no one is selected, default secret key is used.  "
@@ -462,7 +462,7 @@ Content-Disposition: attachment; filename=smime.p7s
                         (message-options-set 'message-recipients
                                              (read-string "Recipients: ")))
                     "[ \f\t\n\r\v,]+"))))
-      (if mml-smime-verbose
+      (if (eq mm-sign-option 'guided)
          (setq recipients
                (epa-select-keys context "\
 Select recipients for encryption.