From: okada <okada>
Date: Mon, 20 May 2002 18:00:27 +0000 (+0000)
Subject: Synch with flim-1_14.
X-Git-Tag: slim-1_14_8~1
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0450a911684b19ba20cf79ffcf870f36dee57700;p=elisp%2Fflim.git

Synch with flim-1_14.
---

diff --git a/SLIM-VERSION b/SLIM-VERSION
index af91dac..17447df 100644
--- a/SLIM-VERSION
+++ b/SLIM-VERSION
@@ -17,3 +17,4 @@ l.14.3 $B<D86$H$b$((B
 1.14.5 $B0BC#M4<B(B
 1.14.6 $BGO^<1QN$2?(B
 1.14.7 $B<r0f:LL>(B
+1.14.7 $B>.CS1I;R(B
diff --git a/VERSION b/VERSION
index 5806526..f4e88e1 100644
--- a/VERSION
+++ b/VERSION
@@ -4,7 +4,7 @@
 
 ;;-------------------------------------------------------------------------
 ;;	Kinki Nippon Railway	$(B6a5&F|K\E4F;(B	http://www.kintetsu.co.jp/
-;;	Ky-Dòto-A Line		$(B5~ET@~(B
+;;	Ky-Dòto Line-A		$(B5~ET@~(B
 ;;-------------------------------------------------------------------------
 1.0.1	Ky-Dòto-A			$(B5~ET(B		; <=> JR, $(B5~ET;T8rDL6I(B
 1.1.0	T-Dòji-A			$(BEl;{(B
@@ -34,7 +34,7 @@
 1.11.3	Saidaiji		$(B@>Bg;{(B		; = $(B6aE4(B $(BF`NI@~(B
 ;;-------------------------------------------------------------------------
 ;;	Kinki Nippon Railway	$(B6a5&F|K\E4F;(B	http://www.kintetsu.co.jp/
-;;	Ky-Dòto-A Line		$(B3`86@~(B
+;;	Ky-Dòto Line-A		$(B3`86@~(B
 ;;-------------------------------------------------------------------------
 	(Saidaiji)		($(B@>Bg;{(B)
 1.12.0	Amagatsuji		$(BFt%vDT(B
@@ -52,7 +52,7 @@
 1.14.1	Yagi			$(BH,LZ(B		; = $(B6aE4(B $(BBg:e@~(B
 1.14.2	Yagi-Nishiguchi		$(BH,LZ@>8}(B
 1.14.3	Unebigory-Dòmae-A		$(B@&K58fNMA0(B
-------	Kashiharajing-Dþ-mae-A	$(B3`86?@5\A0(B	; = $(B6aE4(B $(BFnBg:e@~!"5HLn@~(B
+1.14.4	Kashiharajing-Dþ-mae-A	$(B3`86?@5\A0(B	; = $(B6aE4(B $(BFnBg:e@~!"5HLn@~(B
 
 
 [Chao Version names]
diff --git a/luna.el b/luna.el
index b307ad9..0199aed 100644
--- 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
--- 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) "$B<r0f:LL>(B"]
+  (defconst mime-library-product ["SLIM" (1 14 8) "$B>.CS1I;R(B"]
     "Product name, version number and code name of MIME-library package."))
 
 (defmacro mime-product-name (product)