diff lisp/gnus/mm-encode.el @ 105253:baa4e6ac9e46

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 Sjogren <asjo@koldfront.dk> * spam.el (spam-unregister-on-reregister): Add boolean variable. (spam-resolve-registrations-routine): Use it to unregister articles that change status.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Mon, 28 Sep 2009 12:09:01 +0000
parents 18c2aea5083c
children 0d89cb5de442
line wrap: on
line diff
--- a/lisp/gnus/mm-encode.el	Mon Sep 28 12:02:53 2009 +0000
+++ b/lisp/gnus/mm-encode.el	Mon Sep 28 12:09:01 2009 +0000
@@ -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.