[Emacs-diffs] emacs-24 r117703: [Backport] lisp/gnus/mml2015.el (mml2015-display-key-image): New variable

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 117703
revision-id: address@hidden
parent: address@hidden
author: Adam Sjøgren <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-11-10 23:07:34 +0000
message:
  [Backport] lisp/gnus/mml2015.el (mml2015-display-key-image): New variable
modified:
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/mml2015.el           mml2015.el-20091113204419-o5vbwnq5f7feedwu-3261

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2014-10-27 22:51:18 +0000
+++ b/lisp/gnus/ChangeLog       2014-11-10 23:07:34 +0000
@@ -1,3 +1,7 @@
+2014-11-10  Adam Sjøgren  <address@hidden>
+
+       * mml2015.el (mml2015-display-key-image): New variable.
+
 2014-10-27  Katsumi Yamaoka  <address@hidden>
 
        * gnus.el (gnus-mode-line-buffer-identification):

=== modified file 'lisp/gnus/mml2015.el'
--- a/lisp/gnus/mml2015.el      2014-01-01 07:43:34 +0000
+++ b/lisp/gnus/mml2015.el      2014-11-10 23:07:34 +0000
@@ -152,6 +152,12 @@
   :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 @@
 
 (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"))