From: morioka <morioka>
Date: Wed, 14 Oct 1998 02:23:06 +0000 (+0000)
Subject: Sync up with flim-1_10_5.
X-Git-Tag: chao-1_11-199811302358
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fchao-1_11;p=elisp%2Fflim.git

Sync up with flim-1_10_5.
---

diff --git a/ChangeLog b/ChangeLog
index 592e922..35ea894 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1998-10-14  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* mel.el: Must require poem.
+
 1998-10-12  Katsumi Yamaoka   <yamaoka@jpl.org>
 
 	* README.en: Add explanation about `VERSION_SPECIFIC_LISPDIR'.
@@ -21,7 +25,6 @@
 	* FLIM-ELS: Don't install mel-ccl in anything older than XEmacs 21
 	with MULE.
 
-
 1998-10-10  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
 	* mel-ccl.el (base64-ccl-write-decoded-region): bind
diff --git a/FLIM-VERSION b/FLIM-VERSION
index a44cbf1..d1f045e 100644
--- a/FLIM-VERSION
+++ b/FLIM-VERSION
@@ -27,7 +27,7 @@
 1.10.2	Kintetsu-Miyazu		$(B6aE45\DE(B
 1.10.3	Komada			$(B9}ED(B
 1.10.4	Shin-H-Dòsono-A		$(B?7=K1`(B		; <=> JR $(BJRD.@~(B $(B=K1`(B
------	Kizugawadai		$(BLZDE@nBf(B
+1.10.5	Kizugawadai		$(BLZDE@nBf(B
 -----	Yamadagawa		$(B;3ED@n(B
 -----	Takanohara		$(B9b$N86(B
 -----	Heij-Dò-A			$(BJ?>k(B
@@ -65,3 +65,4 @@
 1.11.2	Kita-Dòji-A			$(BKLBgO)(B
 1.11.3	Kitayama		$(BKL;3(B
 1.11.4	Matugasaki		$(B>>%v:j(B
+1.11.5	Kokusaikaikan		$(B9q:]2q4[(B
diff --git a/Makefile b/Makefile
index 5315d48..2c20beb 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 #
 
 PACKAGE = flim-chao
-VERSION = 1.11.4
+VERSION = 1.11.5
 
 TAR	= tar
 RM	= /bin/rm -f
diff --git a/mel.el b/mel.el
index bd4ea11..51d611c 100644
--- a/mel.el
+++ b/mel.el
@@ -26,6 +26,7 @@
 ;;; Code:
 
 (require 'mime-def)
+(require 'poem)
 
 (defcustom mime-encoding-list
   '("7bit" "8bit" "binary" "base64" "quoted-printable")
diff --git a/mime-def.el b/mime-def.el
index abb60f1..59e7b4a 100644
--- a/mime-def.el
+++ b/mime-def.el
@@ -24,7 +24,7 @@
 
 ;;; Code:
 
-(defconst mime-library-product ["Chao" (1 11 4) "Matugasaki"]
+(defconst mime-library-product ["Chao" (1 11 5) "Kokusaikaikan"]
   "Product name, version number and code name of MIME-library package.")
 
 (defmacro mime-product-name (product)