From: yamaoka <yamaoka>
Date: Thu, 30 Sep 1999 05:48:39 +0000 (+0000)
Subject: Sync up with semi-1_13.
X-Git-Tag: wemi-1_13_7~4
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12529a64dd7f55a0348469efb451a5e350434723;p=elisp%2Fsemi.git

Sync up with semi-1_13.
---

diff --git a/ChangeLog b/ChangeLog
index 58904cb..13288e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 1999-09-29  MORIOKA Tomohiko  <tomo@m17n.org>
 
+	* mime-view.el (mime-display-multipart/mixed): Share cell of
+	`major-mode'.
+	(mime-display-multipart/alternative): Likewise.
+	(mime-display-entity): Refer `major-mode' value of a situation
+	instead of buffer-local-variable `major-mode'.
+
+1999-09-29  MORIOKA Tomohiko  <tomo@m17n.org>
+
 	* mime-play.el (mime-preview-play-current-entity): Use
 	text-property `mime-view-situation' as the initial value of
 	acting-situation to add major-mode.
diff --git a/VERSION b/VERSION
index 1b629b7..9c1fa27 100644
--- a/VERSION
+++ b/VERSION
@@ -80,6 +80,7 @@
 1.13.4	Terai			$(B;{0f(B
 1.13.5	Meih-Dò-A			$(BL@Jv(B
 1.13.6	Komatsu			$(B>.>>(B
+1.13.7	Awazu			$(B0@DE(B
 :	:			:
 -------	Tsuruga			$(BFX2l(B		; = JR $(B>.IM@~(B
 -------	Shin-Hikida		$(B?7I%ED(B
@@ -148,7 +149,7 @@
 1.13.4	Nishi-Yaizu		$(B@>>FDE(B
 1.13.5	Fijieda			$(BF#;^(B
 1.13.6	Rokug-Dò-A			$(BO;9g(B
-------	Shimada			$(BEgED(B
+1.13.7	Shimada			$(BEgED(B
 ------	Kanaya			$(B6bC+(B	; = $(BBg0f@nE4F;(B
 ------	Kikugawa		$(B5F@n(B
 ------	Kakegawa		$(B3]@n(B	; = $(BE7N5IML>8PE4F;(B
diff --git a/mime-view.el b/mime-view.el
index 7e15c80..ba04e57 100644
--- a/mime-view.el
+++ b/mime-view.el
@@ -212,14 +212,6 @@ mother-buffer."
 	      (cons (cons 'encoding (or (mime-entity-encoding entity)
 					"7bit"))
 		    situation)))
-
-    ;; major-mode
-    ;; (or (assq 'major-mode situation)
-    ;;     (setq situation
-    ;;           (cons (cons 'major-mode
-    ;;                       (with-current-buffer (mime-entity-buffer entity)
-    ;;                         major-mode))
-    ;;                 situation)))
     
     situation))
 
@@ -543,14 +535,12 @@ Please press `v' key in this buffer."
 
 (defun mime-display-multipart/mixed (entity situation)
   (let ((children (mime-entity-children entity))
-	(original-major-mode (cdr (assq 'major-mode situation)))
+	(original-major-mode-cell (assq 'major-mode situation))
 	(default-situation
 	  (cdr (assq 'childrens-situation situation))))
-    (if original-major-mode
+    (if original-major-mode-cell
 	(setq default-situation
-	      (cons (cons 'major-mode original-major-mode)
-		    default-situation))
-      )
+	      (cons original-major-mode-cell default-situation)))
     (while children
       (mime-display-entity (car children) nil default-situation)
       (setq children (cdr children))
@@ -574,18 +564,16 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
 
 (defun mime-display-multipart/alternative (entity situation)
   (let* ((children (mime-entity-children entity))
-	 (original-major-mode (cdr (assq 'major-mode situation)))
+	 (original-major-mode-cell (assq 'major-mode situation))
 	 (default-situation
 	   (cdr (assq 'childrens-situation situation)))
 	 (i 0)
 	 (p 0)
 	 (max-score 0)
 	 situations)
-    (if original-major-mode
+    (if original-major-mode-cell
 	(setq default-situation
-	      (cons (cons 'major-mode original-major-mode)
-		    default-situation))
-      )
+	      (cons original-major-mode-cell default-situation)))
     (setq situations
 	  (mapcar (function
 		   (lambda (child)
@@ -770,7 +758,8 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
 	   (eq (cdr (assq 'header situation)) 'visible))
 	  (header-presentation-method
 	   (or (cdr (assq 'header-presentation-method situation))
-	       (cdr (assq major-mode mime-header-presentation-method-alist))))
+	       (cdr (assq (cdr (assq 'major-mode situation))
+			  mime-header-presentation-method-alist))))
 	  (body-presentation-method
 	   (cdr (assq 'body-presentation-method situation)))
 	  (children (mime-entity-children entity)))
diff --git a/semi-def.el b/semi-def.el
index d72ce17..c3dec37 100644
--- a/semi-def.el
+++ b/semi-def.el
@@ -34,7 +34,7 @@
 
 (eval-when-compile (require 'static))
 
-(defconst mime-user-interface-product ["WEMI" (1 13 6) "Rokugò"]
+(defconst mime-user-interface-product ["WEMI" (1 13 7) "Shimada"]
   "Product name, version number and code name of MIME-kernel package.")
 
 (autoload 'mule-caesar-region "mule-caesar"