Synch with flim-1_14.

diff --git a/SLIM-VERSION b/SLIM-VERSION
index af91dac..17447df 100644 (file)
--- a/SLIM-VERSION
+++ b/SLIM-VERSION
@@ -17,3 +17,4 @@ l.14.3 \e$B<D86$H$b$(\e(B
 1.14.5 \e$B0BC#M4<B\e(B
 1.14.6 \e$BGO^<1QN$2?\e(B
 1.14.7 \e$B<r0f:LL>\e(B
+1.14.7 \e$B>.CS1I;R\e(B

diff --git a/VERSION b/VERSION
index 5806526..f4e88e1 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -4,7 +4,7 @@
 
 ;;-------------------------------------------------------------------------
 ;;     Kinki Nippon Railway    \e$(B6a5&F|K\E4F;\e(B     http://www.kintetsu.co.jp/
-;;     Ky\e-Dòto\e-A Line                \e$(B5~ET@~\e(B
+;;     Ky\e-Dòto Line\e-A                \e$(B5~ET@~\e(B
 ;;-------------------------------------------------------------------------
 1.0.1  Ky\e-Dòto\e-A                     \e$(B5~ET\e(B             ; <=> JR, \e$(B5~ET;T8rDL6I\e(B
 1.1.0  T\e-Dòji\e-A                      \e$(BEl;{\e(B
@@ -34,7 +34,7 @@
 1.11.3 Saidaiji                \e$(B@>Bg;{\e(B           ; = \e$(B6aE4\e(B \e$(BF`NI@~\e(B
 ;;-------------------------------------------------------------------------
 ;;     Kinki Nippon Railway    \e$(B6a5&F|K\E4F;\e(B     http://www.kintetsu.co.jp/
-;;     Ky\e-Dòto\e-A Line                \e$(B3`86@~\e(B
+;;     Ky\e-Dòto Line\e-A                \e$(B3`86@~\e(B
 ;;-------------------------------------------------------------------------
        (Saidaiji)              (\e$(B@>Bg;{\e(B)
 1.12.0 Amagatsuji              \e$(BFt%vDT\e(B
@@ -52,7 +52,7 @@
 1.14.1 Yagi                    \e$(BH,LZ\e(B             ; = \e$(B6aE4\e(B \e$(BBg:e@~\e(B
 1.14.2 Yagi-Nishiguchi         \e$(BH,LZ@>8}\e(B
 1.14.3 Unebigory\e-Dòmae\e-A             \e$(B@&K58fNMA0\e(B
------- Kashiharajing\e-Dþ-mae\e-A        \e$(B3`86?@5\A0\e(B       ; = \e$(B6aE4\e(B \e$(BFnBg:e@~!"5HLn@~\e(B
+1.14.4 Kashiharajing\e-Dþ-mae\e-A        \e$(B3`86?@5\A0\e(B       ; = \e$(B6aE4\e(B \e$(BFnBg:e@~!"5HLn@~\e(B
 
 
 [Chao Version names]

diff --git a/luna.el b/luna.el
index b307ad9..0199aed 100644 (file)
--- a/luna.el
+++ b/luna.el
@@ -1,6 +1,6 @@
 ;;; luna.el --- tiny OOP system kernel
 
-;; Copyright (C) 1999,2000 Free Software Foundation, Inc.
+;; Copyright (C) 1999,2000,2002 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <tomo@m17n.org>
 ;; Keywords: OOP
@@ -97,15 +97,7 @@ The optional 2nd arg SLOTS is a list of slots CLASS will have."
 (defun luna-class-find-member (class member-name)
   (or (stringp member-name)
       (setq member-name (symbol-name member-name)))
-  (or (intern-soft member-name (luna-class-obarray class))
-      (let ((parents (luna-class-parents class))
-           ret)
-       (while (and parents
-                   (null
-                    (setq ret (luna-class-find-member
-                               (luna-find-class (pop parents))
-                               member-name)))))
-       ret)))
+  (intern-soft member-name (luna-class-obarray class)))
 
 
 ;; Return a member (slot or method) of CLASS that has name

diff --git a/mime-def.el b/mime-def.el
index cfdeefb..24573f1 100644 (file)
--- a/mime-def.el
+++ b/mime-def.el
@@ -32,7 +32,7 @@
 (eval-when-compile (require 'luna))    ; luna-arglist-to-arguments
 
 (eval-and-compile
-  (defconst mime-library-product ["SLIM" (1 14 7) "\e$B<r0f:LL>\e(B"]
+  (defconst mime-library-product ["SLIM" (1 14 8) "\e$B>.CS1I;R\e(B"]
     "Product name, version number and code name of MIME-library package."))
 
 (defmacro mime-product-name (product)