From ce30df1377a88059535217dbdb592d35d05a86c8 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Wed, 1 Jul 1998 10:17:22 +0000
Subject: [PATCH] WEMI 1.8.2: Sync up with SEMI 1.8.2.

---
 ChangeLog    |   17 +++++++++++++++++
 Makefile     |    2 +-
 README.en    |    2 +-
 VERSION      |    4 ++--
 mime-play.el |    3 +--
 mime-view.el |    6 +-----
 semi-def.el  |    2 +-
 7 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a3debbd..0ef5143 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+1998-07-01  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+	* WEMI: Version 1.8.2 (Katahama) released.
+
+1998-07-01  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* README.en (Required environment): Modify for FLIM 1.8.0.
+
+	* mime-view.el (mime-display-entity): Modify for
+	`mime-insert-decoded-header'.
+
+1998-06-30  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* mime-play.el (mime-activate-mailcap-method): Use
+	`mime-write-entity-content'.
+
+
 1998-06-30  Katsumi Yamaoka   <yamaoka@jpl.org>
 
 	* WEMI: Version 1.8.1 (Numazu) released.
diff --git a/Makefile b/Makefile
index f308da2..dcec6dc 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@
 # Makefile for WEMI.
 #
 
-VERSION = 1.8.1
 PACKAGE = wemi
+VERSION = 1.8.2
 
 SHELL	= /bin/sh
 MAKE	= make
diff --git a/README.en b/README.en
index f110d15..557daee 100644
--- a/README.en
+++ b/README.en
@@ -44,7 +44,7 @@ Required environment
   19.14.  WEMI also does not support Emacs 19.29 to 19.34, XEmacs
   19.15 or XEmacs 20.2 without mule, but WEMI may work with them.
 
-  SEMI requires APEL (8.7 or later) and FLIM (1.7.0 or later) package.
+  SEMI requires APEL (8.7 or later) and FLIM (1.8.0 or later) package.
   Please install them before installing it.  APEL package is available
   at:
 
diff --git a/VERSION b/VERSION
index 34095ce..221a02f 100644
--- a/VERSION
+++ b/VERSION
@@ -60,7 +60,7 @@
 1.7.1	Higashi-Toyama		$(BElIY;3(B
 1.8.0	Toyama			$(BIY;3(B		; = JR $(B9b;3K\@~!"IY;39A@~(B
 1.8.1	Kureha			$(B8b1)(B
------	Kosugi			$(B>.?y(B
+1.8.2	Kosugi			$(B>.?y(B
 -----	Ecch-Dþ-Daimon-A		$(B1[CfBgLg(B
 -----	Takaoka			$(B9b2,(B		; = JR $(BI98+@~!">kC<@~(B
 :	:			:
@@ -117,7 +117,7 @@
 1.7.1	Kan'nami		$(BH!Fn(B
 1.8.0	Mishima			$B;0Eg(B	; = $B0KF&H":,E4F;(B
 1.8.1	Numazu			$B>BDE(B	; = JR $(B8fEB>l@~(B
------	Katahama		$BJRIM(B
+1.8.2	Katahama		$BJRIM(B
 -----	Hara			$B86(B
 -----	Higashi-Tagonoura	$BElED;R%N1:(B
 -----	Yoshiwara		$B5H86(B	; = $B3YFnE4F;(B
diff --git a/mime-play.el b/mime-play.el
index 344b9da..106ef8b 100644
--- a/mime-play.el
+++ b/mime-play.el
@@ -211,8 +211,7 @@ specified, play as it.  Default MODE is \"play\"."
 		  (make-temp-name
 		   (expand-file-name "EMI" mime-temp-directory))
 		  ))
-	  (mime-write-decoded-region (mime-entity-body-start entity) end
-				     name (cdr (assq 'encoding situation)))
+          (mime-write-entity-content entity name)
 	  (message "External method is starting...")
 	  (let ((process
 		 (let ((command
diff --git a/mime-view.el b/mime-view.el
index bd1056d..97a678d 100644
--- a/mime-view.el
+++ b/mime-view.el
@@ -682,11 +682,7 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
 	    (funcall header-presentation-method entity situation)
 	  (mime-insert-decoded-header entity
 				      mime-view-ignored-field-list
-				      mime-view-visible-field-list
-				      (if (mime-entity-cooked-p entity)
-					  nil
-					default-mime-charset))
-	  )
+				      mime-view-visible-field-list))
 	(goto-char (point-max))
 	(insert "\n")
 	(run-hooks 'mime-display-header-hook)
diff --git a/semi-def.el b/semi-def.el
index bfe6914..fd7dac1 100644
--- a/semi-def.el
+++ b/semi-def.el
@@ -29,7 +29,7 @@
 (eval-when-compile (require 'cl))
 
 
-(defconst mime-user-interface-version '("WEMI" "Numazu" 1 8 1)
+(defconst mime-user-interface-version '("WEMI" "Katahama" 1 8 2)
   "Implementation name, version name and numbers of MIME-kernel package.")
 
 (autoload 'mule-caesar-region "mule-caesar"
-- 
1.7.10.4