diff options
| author | Adam Sjøgren <asjo@koldfront.dk> | 2014-05-08 22:42:13 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2014-05-08 22:42:13 +0000 |
| commit | ce1a1d7addf707e198b6d4b90c029784ac4a4365 (patch) | |
| tree | 591c4160c839df158591e039df1c71f36df3023e /lisp | |
| parent | 1e125ee226ff28ab01e78bcaa5a4a8f76eb1c81b (diff) | |
| download | emacs-ce1a1d7addf707e198b6d4b90c029784ac4a4365.tar.gz | |
lisp/gnus/mml2015.el (mml2015-display-key-image): New variable
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/gnus/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/gnus/mml2015.el | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 8cc7397794f..801acc437a8 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,7 @@ +2014-05-08 Adam Sjøgren <asjo@koldfront.dk> + + * mml2015.el (mml2015-display-key-image): New variable. + 2014-05-08 Glenn Morris <rgm@gnu.org> * gnus-fun.el (gnus-grab-cam-face): diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el index a533829ce5c..9a9eb797bf0 100644 --- a/lisp/gnus/mml2015.el +++ b/lisp/gnus/mml2015.el @@ -147,6 +147,12 @@ If set, it overrides the setting of `mml2015-sign-with-sender'." :group 'mime-security :type 'integer) +(defcustom mml2015-display-key-image t + "If t, try to display key images." + :version "24.4" + :group 'mime-security + :type 'boolean) + ;; Extract plaintext from cleartext signature. IMO, this kind of task ;; should be done by GnuPG rather than Elisp, but older PGP backends ;; (such as Mailcrypt, and PGG) discard the output from GnuPG. @@ -898,7 +904,8 @@ If set, it overrides the setting of `mml2015-sign-with-sender'." (defun mml2015-epg-signature-to-string (signature) (concat (epg-signature-to-string signature) - (mml2015-epg-key-image-to-string (epg-signature-key-id signature)))) + (when mml2015-display-key-image + (mml2015-epg-key-image-to-string (epg-signature-key-id signature))))) (defun mml2015-epg-verify-result-to-string (verify-result) (mapconcat #'mml2015-epg-signature-to-string verify-result "\n")) |