This commit was manufactured by cvs2svn to create branch 'emiko-1_14-epg'.

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

diff --git a/mime-image.el b/mime-image.el
index 07f718f..12e136d 100644 (file)
--- a/mime-image.el
+++ b/mime-image.el
@@ -27,8 +27,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU XEmacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 ;;     If you use this program with MULE, please install
@@ -189,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
 ;;;