Changes committed gnus/lisp (6 files)

Modified: ChangeLog mm-decode.el mm-encode.el mml-smime.el mml1991.el
          mml2015.el

* mm-encode.el (mm-sign-option, mm-encrypt-option): New user option;
moved from mm-decode.el.


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.2022 gnus/lisp/ChangeLog:7.2023
--- ChangeLog:7.2022	Tue Sep 22 22:58:46 2009
+++ ChangeLog	Tue Sep 22 23:57:33 2009
@@ -1,8 +1,8 @@
 2009-09-22  Daiki Ueno  <[email protected]>
 
-	* mm-decode.el (mm-sign-option): New user option.
+	* mm-encode.el (mm-sign-option, mm-encrypt-option): New user option.
 	* mml2015.el (mml2015-epg-sign, mml2015-epg-encrypt): Let users select
-	signing keys if mm-sign-option is 'guided.
+	keys from the menu if mm-{sign,encrypt}-option is 'guided.
 	* mml-smime.el (mml-smime-epg-sign, mml-smime-epg-encrypt): Ditto.
 	* mml1991.el (mml1991-epg-sign, mml1991-epg-encrypt): Ditto.
 
Index: mm-decode.el
diff -u gnus/lisp/mm-decode.el:7.72 gnus/lisp/mm-decode.el:7.73
--- mm-decode.el:7.72	Tue Sep 22 22:52:30 2009
+++ mm-decode.el	Tue Sep 22 23:57:33 2009
@@ -488,15 +488,6 @@
 		 (item :tag "ask" nil))
   :group 'mime-security)
 
-(defcustom mm-sign-option nil
-  "Option how to create signed parts.
-nil, use the default keys without asking;
-`guided', let you select signing keys from the menu."
-  :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: mm-encode.el
diff -u gnus/lisp/mm-encode.el:7.18 gnus/lisp/mm-encode.el:7.19
--- mm-encode.el:7.18	Mon Sep  7 10:37:39 2009
+++ mm-encode.el	Tue Sep 22 23:57:33 2009
@@ -60,6 +60,24 @@
 			       (const base64))))
   :group 'mime)
 
+(defcustom mm-sign-option nil
+  "Option how to create signed parts.
+nil, use the default keys without asking;
+`guided', let you select signing keys from the menu."
+  :version "23.1"
+  :type '(choice (item guided)
+		 (item :tag "default" nil))
+  :group 'mime-security)
+
+(defcustom mm-encrypt-option nil
+  "Option how to create encrypted parts.
+nil, use the default keys without asking;
+`guided', let you select recipients' keys from the menu."
+  :version "23.1"
+  :type '(choice (item guided)
+		 (item :tag "default" nil))
+  :group 'mime-security)
+
 (defvar mm-use-ultra-safe-encoding nil
   "If non-nil, use encodings aimed at Procrustean bed survival.
 
Index: mml-smime.el
diff -u gnus/lisp/mml-smime.el:7.25 gnus/lisp/mml-smime.el:7.26
--- mml-smime.el:7.25	Tue Sep 22 22:55:26 2009
+++ mml-smime.el	Tue Sep 22 23:57:33 2009
@@ -462,7 +462,7 @@
 			 (message-options-set 'message-recipients
 					      (read-string "Recipients: ")))
 		     "[ \f\t\n\r\v,]+"))))
-      (if (eq mm-sign-option 'guided)
+      (if (eq mm-encrypt-option 'guided)
 	  (setq recipients
 		(epa-select-keys context "\
 Select recipients for encryption.
Index: mml1991.el
diff -u gnus/lisp/mml1991.el:7.32 gnus/lisp/mml1991.el:7.33
--- mml1991.el:7.32	Tue Sep 22 22:58:58 2009
+++ mml1991.el	Tue Sep 22 23:57:33 2009
@@ -34,7 +34,7 @@
   (require 'cl)
   (require 'mm-util))
 
-(require 'mm-decode)
+(require 'mm-encode)
 (require 'mml-sec)
 
 (defvar mc-pgp-always-sign)
@@ -449,7 +449,7 @@
 			       (or (epg-expand-group config recipient)
 				   (list recipient)))
 			     recipients))))
-    (if (eq mm-sign-option 'guided)
+    (if (eq mm-encrypt-option 'guided)
 	(setq recipients
 	      (epa-select-keys context "Select recipients for encryption.
 If no one is selected, symmetric encryption will be performed.  "
Index: mml2015.el
diff -u gnus/lisp/mml2015.el:7.58 gnus/lisp/mml2015.el:7.59
--- mml2015.el:7.58	Tue Sep 22 12:56:12 2009
+++ mml2015.el	Tue Sep 22 23:57:33 2009
@@ -1269,7 +1269,7 @@
 	(unless mml2015-signers
 	  (error "mml2015-signers not set"))
 	(setq recipients (nconc recipients mml2015-signers)))
-      (if (eq mm-sign-option 'guided)
+      (if (eq mm-encrypt-option 'guided)
 	  (setq recipients
 		(epa-select-keys context "\
 Select recipients for encryption.