From 76320b6e961c154d373739318fc8267b5e252ceb Mon Sep 17 00:00:00 2001
From: morioka <morioka>
Date: Wed, 14 Oct 1998 05:03:01 +0000
Subject: [PATCH] Merge flim-1_10_5.

---
 ChangeLog    |    7 +++++++
 FLIM-VERSION |    2 +-
 Makefile     |    2 +-
 mel.el       |    1 +
 mime-def.el  |    2 +-
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3d2d799..f356ee4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1998-10-14  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* FLIM: Version 1.10.5 (Kizugawadai) was released.
+
+	* mel.el: Must require poem.
+
+
 1998-10-12  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
 	* FLIM: Version 1.10.4 (Shin-H-Dòsono)-A was released.
diff --git a/FLIM-VERSION b/FLIM-VERSION
index fdf6dad..9f82250 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
diff --git a/Makefile b/Makefile
index 25d849c..8d6ec88 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 #
 
 PACKAGE = flim
-VERSION = 1.10.4
+VERSION = 1.10.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 3106078..fade20f 100644
--- a/mime-def.el
+++ b/mime-def.el
@@ -25,7 +25,7 @@
 ;;; Code:
 
 (eval-and-compile
-  (defconst mime-library-product ["FLIM" (1 10 4) "Shin-H.DŽòsono"]
+  (defconst mime-library-product ["FLIM" (1 10 5) "Kizugawadai"]
     "Product name, version number and code name of MIME-library package.")
   )
 
-- 
1.7.10.4