Merge from semi-1_14:

* mime-view.el (mime-display-multipart/related): Do nothing when
the part is not found.

diff --git a/ChangeLog b/ChangeLog
index 1dc65bb..b9babf6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-24  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+       * mime-view.el (mime-display-multipart/related): Do nothing when
+       the part is not found.
+
 2004-04-18  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * mime-edit.el (mime-file-types): Add application/pdf. Use base64

diff --git a/mime-view.el b/mime-view.el
index 64cd0c8..aafc43e 100644 (file)
--- a/mime-view.el
+++ b/mime-view.el
@@ -905,10 +905,11 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
                    (car (mime-entity-children entity))))
         (original-major-mode-cell (assq 'major-mode situation))
         (default-situation (cdr (assq 'childrens-situation situation))))
-    (if original-major-mode-cell
-       (setq default-situation
-             (cons original-major-mode-cell default-situation)))
-    (mime-display-entity start nil default-situation)))
+    (when start
+      (if original-major-mode-cell
+         (setq default-situation
+               (cons original-major-mode-cell default-situation)))
+      (mime-display-entity start nil default-situation))))
 
 (defun mime-view-entity-content (entity situation)
   (mime-decode-string