From: morioka <morioka>
Date: Fri, 15 May 1998 09:23:32 +0000 (+0000)
Subject: (mime-view-display-entity): Don't use 'mime-entity-media-type,
X-Git-Tag: remi-1_4_0~17
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=1087807c0e66bb56b86f5ad85d9aaa0ae7a1384a;p=elisp%2Fsemi.git

(mime-view-display-entity): Don't use 'mime-entity-media-type,
'mime-entity-media-subtype and 'mime-entity-parameters.
---

diff --git a/mime-view.el b/mime-view.el
index 15c8d64..38b4f38 100644
--- a/mime-view.el
+++ b/mime-view.el
@@ -817,10 +817,8 @@ The compressed face will be piped to this command.")
 					default-situation)
   (let* ((start (mime-entity-point-min entity))
 	 (end (mime-entity-point-max entity))
-	 (media-type (mime-entity-media-type entity))
-	 (media-subtype (mime-entity-media-subtype entity))
-	 (params (mime-entity-parameters entity))
-	 (encoding (mime-entity-encoding entity))
+         (content-type (mime-entity-content-type entity))
+         (encoding (mime-entity-encoding entity))
 	 end-of-header e nb ne subj)
     (set-buffer ibuf)
     (goto-char start)
@@ -834,15 +832,15 @@ The compressed face will be piped to this command.")
       (narrow-to-region start end)
       (setq subj
 	    (eword-decode-string
-	     (mime-raw-get-subject params encoding)))
+	     (mime-raw-get-subject
+	      (mime-content-type-parameters content-type)
+	      encoding)))
       )
     (let* ((situation
 	    (ctree-match-calist mime-preview-condition
-				(list* (cons 'type       media-type)
-				       (cons 'subtype    media-subtype)
-				       (cons 'encoding   encoding)
-				       (cons 'major-mode major-mode)
-				       (append params
+				(append content-type
+					(list* (cons 'encoding   encoding)
+					       (cons 'major-mode major-mode)
 					       default-situation))))
 	   (button-is-invisible
 	    (eq (cdr (assq 'entity-button situation)) 'invisible))