merge from semi-1_14:

[elisp/semi.git] / mime-image.el

diff --git a/mime-image.el b/mime-image.el
index 39806f9..c884387 100644 (file)
--- 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
 ;;;