From: morioka <morioka>
Date: Wed, 10 Jun 1998 11:07:22 +0000 (+0000)
Subject: (mime-entity-situation): New function.
X-Git-Tag: remi-1_6_0~31
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=c8590635e172e1f7e38affd711c58c14405124a9;p=elisp%2Fsemi.git

(mime-entity-situation): New function.
(mime-preview-multipart/alternative): Use `mime-entity-situation'.
(mime-view-display-entity): Use `mime-entity-situation'.
---

diff --git a/mime-view.el b/mime-view.el
index 8c7fb6d..6ff9982 100644
--- a/mime-view.el
+++ b/mime-view.el
@@ -200,6 +200,17 @@ If optional argument MESSAGE-INFO is not specified,
 	 (set-buffer (mime-entity-buffer entity))
 	 mime-raw-message-info))))
 
+(defsubst mime-entity-situation (entity)
+  "Return situation of ENTITY."
+  (append (or (mime-entity-content-type entity)
+	      (make-mime-content-type 'text 'plain))
+	  (list (cons 'encoding (mime-entity-encoding entity))
+		(cons 'major-mode
+		      (save-excursion
+			(set-buffer (mime-entity-buffer entity))
+			major-mode)))
+	  ))
+
 (defsubst mime-raw-point-to-entity-node-id (point &optional message-info)
   "Return entity-node-id from POINT in mime-raw-buffer.
 If optional argument MESSAGE-INFO is not specified,
@@ -545,13 +556,8 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
 		     (let ((situation
 			    (or (ctree-match-calist
 				 mime-preview-condition
-				 (append
-				  (or (mime-entity-content-type child)
-				      (make-mime-content-type 'text 'plain))
-				  (list* (cons 'encoding
-					       (mime-entity-encoding child))
-					 (cons 'major-mode major-mode)
-					 default-situation)))
+				 (append (mime-entity-situation child)
+					 default-situation))
 				default-situation)))
 		       (if (cdr (assq 'body-presentation-method situation))
 			   (let ((score
@@ -834,8 +840,6 @@ The compressed face will be piped to this command.")
 					&optional situation)
   (let* ((start (mime-entity-point-min entity))
 	 (end (mime-entity-point-max 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)
@@ -852,13 +856,8 @@ The compressed face will be piped to this command.")
     (or situation
 	(setq situation
 	      (or (ctree-match-calist mime-preview-condition
-				      (append
-				       (or content-type
-					   (make-mime-content-type
-					    'text 'plain))
-				       (list* (cons 'encoding   encoding)
-					      (cons 'major-mode major-mode)
-					      default-situation)))
+				      (append (mime-entity-situation entity)
+					      default-situation))
 		  default-situation)))
     (let ((button-is-invisible
 	   (eq (cdr (assq 'entity-button situation)) 'invisible))