From: yamaoka <yamaoka>
Date: Tue, 5 Oct 1999 03:38:21 +0000 (+0000)
Subject: (gnus-treat-predicate): Check whether arg's value is t before checking for
X-Git-Tag: t-gnus-6_13_2-02~2
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c52b7da8fd08e653170783e843ae75e8a0d63aea;p=elisp%2Fgnus.git-

(gnus-treat-predicate): Check whether arg's value is t before checking for
`condition'.
(gnus-article-prepare-mime-display): Search for the entity children if the
primary type is `multipart'.
---

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 0692dd8..95ccf95 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2936,10 +2936,14 @@ If ALL-HEADERS is non-nil, no headers are hidden."
 		entity
 		(setq next (next-single-property-change (point)
 							'mime-view-entity)))
-      (setq type (mime-entity-content-type entity)
-	    type (format "%s/%s"
-			 (mime-content-type-primary-type type)
-			 (mime-content-type-subtype type)))
+      (let ((types (mime-entity-content-type entity)))
+	(while (eq 'multipart (mime-content-type-primary-type types))
+	  (setq entity (car (mime-entity-children entity))
+		types (mime-entity-content-type entity)))
+	(when types
+	  (setq type (format "%s/%s"
+			     (mime-content-type-primary-type types)
+			     (mime-content-type-subtype types)))))
       (if (string-equal type "message/rfc822")
 	  (save-restriction
 	    (narrow-to-region (point) (point-max))
@@ -4986,10 +4990,10 @@ For example:
 	(equal (cadr val) type))
        (t
 	(gnus-treat-predicate pred)))))
-   (condition
-    (eq condition val))
    ((eq val t)
     t)
+   (condition
+    (eq condition val))
    ((eq val 'head)
     nil)
    ((eq val 'last)