merge from semi-1_14 branch:

* mime-edit.el (mime-file-types): Add application/vnd.ms-excel.
(mime-content-types): Add application/vnd.ms-excel and
application/msword.
* mime-image.el (mime-display-image): Ignore errors about image
decoding.

diff --git a/ChangeLog b/ChangeLog
index 31a623e..f1ffd1b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-04-04  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+       * mime-edit.el (mime-file-types): Add application/vnd.ms-excel.
+       (mime-content-types): Add application/vnd.ms-excel and
+       application/msword.
+
+2004-02-12  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * mime-image.el (mime-display-image): Ignore errors about image
+       decoding.
+
 2004-01-15  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mime-edit.el (mime-edit-normalize-body): Fix a comment that the

diff --git a/mime-edit.el b/mime-edit.el
index 1e19f6f..b7fb75e 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -230,6 +230,8 @@ To insert a signature file automatically, call the function
     ("application"
      ("octet-stream" ("type" "" "tar" "shar"))
      ("postscript")
+     ("msword")
+     ("vnd.ms-excel")
      ("vnd.ms-powerpoint")
      ("x-kiss" ("x-cnf")))
     ("image"
@@ -305,6 +307,10 @@ To insert a signature file automatically, call the function
      "application" "msword" nil
      "base64"
      "attachment" (("filename" . file)))
+    ("\\.xls$"                         ; MS Excel
+     "application" "vnd.ms-excel" nil
+     "base64"
+     "attachment" (("filename" . file)))
     ("\\.ppt$"                         ; MS Power Point
      "application" "vnd.ms-powerpoint" nil
      "base64"

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