[gnus git] branch master updated: m0-11-7-gcae0946 =1= * mml2015.el (mml2015-display-key-image): New variable.

       via  cae09469fa95d33e40ead0a2dcff45f815c275ce (commit)
      from  db5eb793e0a61a938a6d537604924c04e43fcb65 (commit)


- Log -----------------------------------------------------------------
commit cae09469fa95d33e40ead0a2dcff45f815c275ce
Author: Adam Sjøgren <[email protected]>
Date:   Thu May 8 20:01:40 2014 +0200

    * mml2015.el (mml2015-display-key-image): New variable.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5ae46de..ed78889 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-08  Adam Sjøgren  <[email protected]>
+
+	* mml2015.el (mml2015-display-key-image): New variable.
+
 2014-05-08  Glenn Morris  <[email protected]>
 
 	* gnus-fun.el (gnus-grab-cam-face):
diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index a533829..9a9eb79 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"))

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog  |    4 ++++
 lisp/mml2015.el |    9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project