* 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.

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 098f091..595d5f7 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -488,6 +488,14 @@ result of the verification."
                 (item :tag "ask" nil))
   :group 'mime-security)
 
+(defcustom mm-sign-option nil
+  "Option how to create signed parts.
+nil, use the default keys; `guided', let you to select signing keys."
+  :version "23.1"
+  :type '(choice (item guided)
+                (item :tag "default" nil))
+  :group 'mime-security)
+
 (defvar mm-viewer-completion-map
   (let ((map (make-sparse-keymap 'mm-viewer-completion-map)))
     (set-keymap-parent map minibuffer-local-completion-map)

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 508c51f..22a0184 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -1187,7 +1187,7 @@ Whether the passphrase is cached at all is controlled by
          (or (message-options-get 'mml2015-epg-signers)
              (message-options-set
               'mml2015-epg-signers
-              (if mml2015-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.  "
@@ -1269,7 +1269,7 @@ If no one is selected, default secret key is used.  "
        (unless mml2015-signers
          (error "mml2015-signers not set"))
        (setq recipients (nconc recipients mml2015-signers)))
-      (if mml2015-verbose
+      (if (eq mm-sign-option 'guided)
          (setq recipients
                (epa-select-keys context "\
 Select recipients for encryption.
@@ -1297,7 +1297,7 @@ If no one is selected, symmetric encryption will be performed.  "
            (or (message-options-get 'mml2015-epg-signers)
                (message-options-set
                 'mml2015-epg-signers
-                (if mml2015-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.  "