Synch with Gnus trunk.

2009-09-22  Daiki Ueno  <ueno@unixuser.org>

 * mm-encode.el (mm-sign-option, mm-encrypt-option): New user option.
 * mml2015.el (mml2015-epg-sign, mml2015-epg-encrypt): Let users select
 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.

2009-09-15  Katsumi Yamaoka  <yamaoka@jpl.org>

 * gnus-art.el (gnus-article-edit-part): Work for the buffer
 configuration that provides the sole article window in a frame;
 position point correctly after deleting a part.

2009-09-14  Adam Sjøgren  <asjo@koldfront.dk>

 * spam.el (spam-unregister-on-reregister): Add boolean variable.
 (spam-resolve-registrations-routine): Use it to unregister articles
 that change status.

1 files changed, 18 insertions, 0 deletions

diff --git a/lisp/gnus/mm-encode.el b/lisp/gnus/mm-encode.el
index 0d41caaf484..d4f9ea76006 100644
--- a/lisp/gnus/mm-encode.el
+++ b/lisp/gnus/mm-encode.el
@@ -60,6 +60,24 @@ to specify encoding of non-ASCII MIME parts."
 			       (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.