Merge changes made in Gnus master

[gnu-emacs] / lisp / gnus / mml2015.el

diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index ffe98b6deb108bf9a22dd93428875089f0dfc19f..3efa5c23bb32e49eee931794b981dd84a32e62ca 100644 (file)
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -148,6 +148,7 @@ If set, it overrides the setting of `mml2015-sign-with-sender'."
 
 (defcustom mml2015-maximum-key-image-dimension 64
   "The maximum dimension (width or height) of any key images."
+  :version "24.4"
   :group 'mime-security
   :type 'integer)
 
@@ -876,23 +877,27 @@ If set, it overrides the setting of `mml2015-sign-with-sender'."
                           (shell-quote-argument epg-gpg-program) key-id))))
       (when (> (length data) 0)
         (insert (substring data 16))
-        (create-image (buffer-string) nil t)))))
+       (condition-case nil
+           (gnus-create-image (buffer-string) nil t)
+         (error))))))
 
 (autoload 'gnus-rescale-image "gnus-util")
 
 (defun mml2015-epg-key-image-to-string (key-id)
   "Return a string with the image of a key, if any"
-  (let* ((result "")
-         (key-image (mml2015-epg-key-image key-id)))
-    (when key-image
-      (setq result "  ")
-      (put-text-property
-       1 2 'display
-       (gnus-rescale-image key-image
-                          (cons mml2015-maximum-key-image-dimension
-                                mml2015-maximum-key-image-dimension))
-       result))
-    result))
+  (let ((key-image (mml2015-epg-key-image key-id)))
+    (if (not key-image)
+       ""
+      (condition-case error
+         (let ((result "  "))
+           (put-text-property
+            1 2 'display
+            (gnus-rescale-image key-image
+                                (cons mml2015-maximum-key-image-dimension
+                                      mml2015-maximum-key-image-dimension))
+            result)
+           result)
+       (error "")))))
 
 (defun mml2015-epg-signature-to-string (signature)
   (concat (epg-signature-to-string signature)