Changes committed gnus/lisp (mml1991.el)

"Daiki Ueno" <[email protected]> Tue, 22 Sep 2009 22:58:58 +0200
Newsgroups gmane.emacs.gnus.commits
Message-ID <[email protected]>
Modified: mml1991.el

* mml1991.el (mml1991-epg-sign, mml1991-epg-encrypt): Let users select
signing keys if mm-sign-option is 'guided.


Index: mml1991.el
diff -u gnus/lisp/mml1991.el:7.31 gnus/lisp/mml1991.el:7.32
--- mml1991.el:7.31	Thu Jan 22 08:02:16 2009
+++ mml1991.el	Tue Sep 22 22:58:58 2009
@@ -34,6 +34,7 @@
   (require 'cl)
   (require 'mm-util))
 
+(require 'mm-decode)
 (require 'mml-sec)
 
 (defvar mc-pgp-always-sign)
@@ -368,7 +369,7 @@
 (defun mml1991-epg-sign (cont)
   (let ((context (epg-make-context))
 	headers cte signers signature)
-    (if mml1991-verbose
+    (if (eq mm-sign-option 'guided)
 	(setq signers (epa-select-keys context "Select keys for signing.
 If no one is selected, default secret key is used.  "
 				       mml1991-signers t))
@@ -448,7 +449,7 @@
 			       (or (epg-expand-group config recipient)
 				   (list recipient)))
 			     recipients))))
-    (if mml1991-verbose
+    (if (eq mm-sign-option 'guided)
 	(setq recipients
 	      (epa-select-keys context "Select recipients for encryption.
 If no one is selected, symmetric encryption will be performed.  "
@@ -466,7 +467,7 @@
 				 mml1991-signers)))
 	  (error "mml1991-signers not set")))
     (when sign
-      (if mml1991-verbose
+      (if (eq mm-sign-option 'guided)
 	  (setq signers (epa-select-keys context "Select keys for signing.
 If no one is selected, default secret key is used.  "
 					 mml1991-signers t))