Sync with flim-1_14_4.

diff --git a/ChangeLog b/ChangeLog
index 0e3ea5a..9697ec5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-16  Hiroya Murata     <lapis-lazuli@pop06.odn.ne.jp>
+
+       * luna.el (luna-class-find-member): Don't search parents'
+       method-spaces.
+
 2002-05-14  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
        * poe/apel-ver.el (apel-ver): Changed to LEMI 1.14.0.

diff --git a/emacs-lisp/luna.el b/emacs-lisp/luna.el
index b307ad9..0199aed 100644 (file)
--- a/emacs-lisp/luna.el
+++ b/emacs-lisp/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