X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-image.el;h=c8843877c21077967974a8b27730ef75f821dc6b;hb=8bce5689f151d2d8434b01986c920d3da3293820;hp=39806f9a74505d2a4d4e9a835ddbb727b51ef9b0;hpb=9508f6e75dac82936bfb331c6bc056285f901c08;p=elisp%2Fsemi.git

diff --git a/mime-image.el b/mime-image.el
index 39806f9..c884387 100644
--- a/mime-image.el
+++ b/mime-image.el
@@ -92,7 +92,8 @@
 		     (list type (if data-p :data :file) file-or-data)
 		     props)
 		  file-or-data))))
-	  (if (nothing-image-instance-p (glyph-image-instance glyph)) nil
+	  (if (nothing-image-instance-p (ignore-errors
+					  (glyph-image-instance glyph))) nil
 	    glyph)))
 
       (defun mime-image-insert (image &optional string area)
@@ -188,15 +189,17 @@
 
 (defun mime-display-image (entity situation)
   (message "Decoding image...")
-  (let ((format (cdr (assq 'image-format situation)))
-	image)
-    (setq image (mime-image-create (mime-entity-content entity) format 'data))
-    (if (null image)
-	(message "Invalid glyph!")
-      (save-excursion
-	(mime-image-insert image)
-	(insert "\n")
-	(message "Decoding image... done")))))
+  (condition-case err
+      (let ((format (cdr (assq 'image-format situation)))
+	    image)
+	(setq image (mime-image-create (mime-entity-content entity) format 'data))
+	(if (null image)
+	    (message "Invalid glyph!")
+	  (save-excursion
+	    (mime-image-insert image)
+	    (insert "\n")
+	    (message "Decoding image...done"))))
+    (error nil err)))
 
 ;;; @ end
 ;;;