X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/7cb18056e648c086bd9710b12d17f4a2cfba9a29..89cccc2f3dc32af8e3cb047edb9c2d4df55ca962:/lisp/gnus/mml2015.el?ds=sidebyside

diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index 389b522aec..3efa5c23bb 100644
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -877,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)