diff options
| author | Gnus developers <ding@gnus.org> | 2011-01-24 23:38:05 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2011-01-24 23:38:05 +0000 |
| commit | c5ecc7690d4afafb42049634d64abd781ff76642 (patch) | |
| tree | d10767179c7f257ab9ae4d33844405a81a309499 /lisp/gnus/mml-smime.el | |
| parent | ab0a61d0acb81353f5636a9c42bec7762dd90c81 (diff) | |
| download | emacs-c5ecc7690d4afafb42049634d64abd781ff76642.tar.gz | |
Merge changes made in Gnus trunk.
shr.el: Use defface to create shr-tag-h[1-6] faces to fontify h[1-6] tags.
mml-smime.el (mml-smime-use): Make it a defcustom and default to 'epg if EPG is loaded.
message.texi (IDNA): Explain what it is.
gnus.texi (The Empty Backend): Document nnnil (bug #7653).
gnus-agent.el (gnus-agent-prompt-send-queue): Whitespace fix.
shr.el (shr-expand-newlines): Proof of concept implemantation of boxy backgrounds.
(shr-expand-newlines): Switch to using overlays to enable kill'n'yank in a more sensible manner.
Diffstat (limited to 'lisp/gnus/mml-smime.el')
| -rw-r--r-- | lisp/gnus/mml-smime.el | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el index 4d27384002f..47176e96d38 100644 --- a/lisp/gnus/mml-smime.el +++ b/lisp/gnus/mml-smime.el @@ -37,7 +37,12 @@ (autoload 'message-narrow-to-headers "message") (autoload 'message-fetch-field "message") -(defvar mml-smime-use 'openssl) +(defcustom mml-smime-use (if (featurep 'epg) 'epg 'openssl) + "Whether to use OpenSSL or EPG to decrypt S/MIME messages. +Defaults to EPG if it's loaded." + :group 'mime-security + :type '(choice (const :tag "EPG" epg) + (const :tag "OpenSSL" openssl))) (defvar mml-smime-function-alist '((openssl mml-smime-openssl-sign |