From: morioka <morioka>
Date: Fri, 15 May 1998 07:14:20 +0000 (+0000)
Subject: (mime-view-display-message): Don't use 'mime-entity-media-type,
X-Git-Tag: remi-1_4_0~19
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=500967f507531ad55bd50833f2ed439797b31464;p=elisp%2Fsemi.git

(mime-view-display-message): 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 8ae704c..15c8d64 100644
--- a/mime-view.el
+++ b/mime-view.el
@@ -738,10 +738,8 @@ The compressed face will be piped to this command.")
 (defun mime-view-display-message (message-info ibuf obuf)
   (let* ((start (mime-entity-point-min message-info))
 	 (end (mime-entity-point-max message-info))
-	 (media-type (mime-entity-media-type message-info))
-	 (media-subtype (mime-entity-media-subtype message-info))
-	 (params (mime-entity-parameters message-info))
-	 (encoding (mime-entity-encoding message-info))
+	 (content-type (mime-entity-content-type message-info))
+         (encoding (mime-entity-encoding message-info))
 	 end-of-header e nb ne subj)
     (set-buffer ibuf)
     (goto-char start)
@@ -755,7 +753,9 @@ 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)))
       )
     (set-buffer obuf)
     (setq nb (point))
@@ -774,11 +774,9 @@ The compressed face will be piped to this command.")
       )
     (let* ((situation
 	    (ctree-match-calist mime-preview-condition
-				(list* (cons 'type       media-type)
-				       (cons 'subtype    media-subtype)
+				(list* (cons 'major-mode major-mode)
 				       (cons 'encoding   encoding)
-				       (cons 'major-mode major-mode)
-				       params)))
+				       content-type)))
 	   (message-button
 	    (cdr (assq 'message-button situation)))
 	   (body-presentation-method