Changes committed gnus/lisp (mm-decode.el mml2015.el)

Modified: mm-decode.el mml2015.el

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


Index: mm-decode.el
diff -u gnus/lisp/mm-decode.el:7.70 gnus/lisp/mm-decode.el:7.71
--- mm-decode.el:7.70	Wed Jun 24 00:39:00 2009
+++ mm-decode.el	Tue Sep 22 12:56:12 2009
@@ -488,6 +488,14 @@
 		 (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)
Index: mml2015.el
diff -u gnus/lisp/mml2015.el:7.57 gnus/lisp/mml2015.el:7.58
--- mml2015.el:7.57	Thu Jan 22 08:02:16 2009
+++ mml2015.el	Tue Sep 22 12:56:12 2009
@@ -1187,7 +1187,7 @@
 	  (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 @@
 	(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 @@
 	    (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.  "