From cae09469fa95d33e40ead0a2dcff45f815c275ce Mon Sep 17 00:00:00 2001 From: =?utf8?q?Adam=20Sj=C3=B8gren?= Date: Thu, 8 May 2014 20:01:40 +0200 Subject: [PATCH] * mml2015.el (mml2015-display-key-image): New variable. --- lisp/ChangeLog | 4 ++++ lisp/mml2015.el | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5ae46de66..ed788894c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-05-08 Adam Sjøgren + + * mml2015.el (mml2015-display-key-image): New variable. + 2014-05-08 Glenn Morris * gnus-fun.el (gnus-grab-cam-face): diff --git a/lisp/mml2015.el b/lisp/mml2015.el index a533829ce..9a9eb797b 100644 --- a/lisp/mml2015.el +++ b/lisp/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")) -- 2.25.1