Merge flim-1_10_5.

diff --git a/ChangeLog b/ChangeLog
index 3d2d799..f356ee4 100644 (file)
--- 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.
+
+\f
 1998-10-12  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * FLIM: Version 1.10.4 (Shin-H\e-Dòsono)\e-A was released.

diff --git a/FLIM-VERSION b/FLIM-VERSION
index fdf6dad..9f82250 100644 (file)
--- a/FLIM-VERSION
+++ b/FLIM-VERSION
@@ -27,7 +27,7 @@
 1.10.2 Kintetsu-Miyazu         \e$(B6aE45\DE\e(B
 1.10.3 Komada                  \e$(B9}ED\e(B
 1.10.4 Shin-H\e-Dòsono\e-A               \e$(B?7=K1`\e(B           ; <=> JR \e$(BJRD.@~\e(B \e$(B=K1`\e(B
------  Kizugawadai             \e$(BLZDE@nBf\e(B
+1.10.5 Kizugawadai             \e$(BLZDE@nBf\e(B
 -----  Yamadagawa              \e$(B;3ED@n\e(B
 -----  Takanohara              \e$(B9b$N86\e(B
 -----  Heij\e-Dò\e-A                     \e$(BJ?>k\e(B

diff --git a/Makefile b/Makefile
index 25d849c..8d6ec88 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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\e.D\8eòsono"]
+  (defconst mime-library-product ["FLIM" (1 10 5) "Kizugawadai"]
     "Product name, version number and code name of MIME-library package.")
   )