From e18c2a53a9813617cfe4862dc03ddd7666133b58 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Adam=20Sj=C3=B8gren?= Date: Thu, 13 Nov 2014 04:22:36 +0000 Subject: [PATCH] [Backport] lisp/gnus/mml2015.el (mml2015-display-key-image): New variable --- lisp/gnus/ChangeLog | 4 ++++ lisp/gnus/mml2015.el | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index e659e983392..6713df85819 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,7 @@ +2014-11-10 Adam Sjøgren + + * mml2015.el (mml2015-display-key-image): New variable. + 2014-10-27 Katsumi Yamaoka * gnus.el (gnus-mode-line-buffer-identification): diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el index 9fc8f6e8c0c..a1e38261b97 100644 --- a/lisp/gnus/mml2015.el +++ b/lisp/gnus/mml2015.el @@ -152,6 +152,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.5" + :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. @@ -903,7 +909,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.39.5