* luna.el (luna-class-find-functions): Don't quote colon keywords.

(luna-send): Ditto.
(luna-call-next-method): Ditto.

* README.ja, README.en (load-path): Remove section.
(What's FLIM): Specify prerequisite version of Emacsen.

diff --git a/README.en b/README.en
index 8ded084..46cbf11 100644 (file)
--- a/README.en
+++ b/README.en
@@ -35,6 +35,11 @@ What's FLIM
 
     mailcap.el --- mailcap parser and utility
 
 
     mailcap.el --- mailcap parser and utility
 

+  This library should work on:
+
+       Emacs 20.5 and up
+       XEmacs 20.4 and up
+

 
 Installation
 ============
 
 Installation
 ============

@@ -127,21 +132,6 @@ Installation
   Notice that XEmacs package system requires XEmacs 21.0 or later.
 
 
   Notice that XEmacs package system requires XEmacs 21.0 or later.
 
 

-load-path (for Emacs or MULE)
-=============================
-
-  If you are using Emacs or Mule, please add directory of FLIM to
-  load-path.  If you install by default setting, you can write
-  subdirs.el for example:
-
-  --------------------------------------------------------------------
-  (normal-top-level-add-to-load-path '("apel" "flim"))
-  --------------------------------------------------------------------
-
-  If you are using XEmacs, there are no need of setting about
-  load-path.
-
-

 Bug reports
 ===========
 
 Bug reports
 ===========
 

diff --git a/README.ja b/README.ja
index 5327de3..bd9a707 100644 (file)
--- a/README.ja
+++ b/README.ja
@@ -33,6 +33,11 @@ FLIM \e$B$H$O!)\e(B
 
     mailcap.el --- mailcap \e$B$N2r@O=hM}Ey\e(B
 
 
     mailcap.el --- mailcap \e$B$N2r@O=hM}Ey\e(B
 

+  \e$B0J2<$N4D6-$GF0:n$7$^$9!'\e(B
+
+       Emacs 20.5 \e$B0J9_\e(B
+       XEmacs 20.4 \e$B0J9_\e(B
+

 
 \e$BF3F~\e(B (install)
 ==============
 
 \e$BF3F~\e(B (install)
 ==============

@@ -78,10 +83,11 @@ FLIM \e$B$H$O!)\e(B
   `PREFIX=...' \e$B$,>JN,$5$l$k$H!";XDj$5$l$?\e(B emacs \e$B%3%^%s%I$N%G%#%l%/%H%j!<\e(B
   \e$BLZ$N@\F,<-$,;HMQ$5$l$^$9\e(B (\e$B$*$=$i$/\e(B /usr/local \e$B$G$9\e(B)\e$B!#\e(B
 
   `PREFIX=...' \e$B$,>JN,$5$l$k$H!";XDj$5$l$?\e(B emacs \e$B%3%^%s%I$N%G%#%l%/%H%j!<\e(B
   \e$BLZ$N@\F,<-$,;HMQ$5$l$^$9\e(B (\e$B$*$=$i$/\e(B /usr/local \e$B$G$9\e(B)\e$B!#\e(B
 

-  \e$BNc$($P!"\e(BPREFIX=/usr/local \e$B$H\e(B Emacs 19.34 \e$B$,;XDj$5$l$l$P!"0J2<$N%G%#%l\e(B
+  \e$BNc$($P!"\e(BPREFIX=/usr/local \e$B$H\e(B Emacs 20.7 \e$B$,;XDj$5$l$l$P!"0J2<$N%G%#%l\e(B

   \e$B%/%H%j!<LZ$,:n@.$5$l$^$9!#\e(B
 
        /usr/local/share/emacs/site-lisp/flim/  --- FLIM
   \e$B%/%H%j!<LZ$,:n@.$5$l$^$9!#\e(B
 
        /usr/local/share/emacs/site-lisp/flim/  --- FLIM

+       /usr/local/share/emacs/20.7/site-lisp/flim/     --- FLIM

 
   Emacs Lisp \e$B%W%m%0%i%`$N$?$a$N\e(B lisp \e$B%G%#%l%/%H%j!<$r;XDj$9$k$3$H$,$G\e(B
   \e$B$-$^$9!#Nc$($P!"\e(B:
 
   Emacs Lisp \e$B%W%m%0%i%`$N$?$a$N\e(B lisp \e$B%G%#%l%/%H%j!<$r;XDj$9$k$3$H$,$G\e(B
   \e$B$-$^$9!#Nc$($P!"\e(B:

@@ -134,20 +140,6 @@ FLIM \e$B$H$O!)\e(B
          \e$B$G$9!#\e(B
 
 
          \e$B$G$9!#\e(B
 
 

-load-path (Emacs \e$B$H\e(B MULE \e$BMQ\e(B)
-=============================
-
-  Emacs \e$B$+\e(B Mule \e$B$r;H$C$F$$$k$J$i!"\e(BFLIM \e$B$N%G%#%l%/%H%j!<$r\e(B load-path \e$B$K\e(B
-  \e$BDI2C$7$F$/$@$5$$!#=i4|@_Dj$N$^$^F3F~$7$?$J$i!"<!$N$h$&$K\e(B subdirs.el 
-  \e$B$r=q$/$3$H$,$G$-$^$9!#Nc\e(B:
-
-  --------------------------------------------------------------------
-  (normal-top-level-add-to-load-path '("apel" "flim"))
-  --------------------------------------------------------------------
-
-  XEmacs \e$B$r;H$C$F$$$k$J$i!"\e(Bload-path \e$B$r@_Dj$9$kI,MW$O$"$j$^$;$s!#\e(B
-
-

 \e$B%P%0Js9p\e(B
 ========
 
 \e$B%P%0Js9p\e(B
 ========
 

diff --git a/luna.el b/luna.el
index 8e755ee..7a8cb53 100644 (file)
--- a/luna.el
+++ b/luna.el
@@ -162,13 +162,13 @@ BODY is the body of method."
 (defun luna-class-find-functions (class service)
   (let ((sym (luna-class-find-member class service)))
     (if (fboundp sym)
 (defun luna-class-find-functions (class service)
   (let ((sym (luna-class-find-member class service)))
     (if (fboundp sym)

-       (cond ((eq (get sym 'luna-method-qualifier) ':before)
+       (cond ((eq (get sym 'luna-method-qualifier) :before)

               (cons (symbol-function sym)
                     (luna-class-find-parents-functions class service)))
               (cons (symbol-function sym)
                     (luna-class-find-parents-functions class service)))

-             ((eq (get sym 'luna-method-qualifier) ':after)
+             ((eq (get sym 'luna-method-qualifier) :after)

               (nconc (luna-class-find-parents-functions class service)
                      (list (symbol-function sym))))
               (nconc (luna-class-find-parents-functions class service)
                      (list (symbol-function sym))))

-             ((eq (get sym 'luna-method-qualifier) ':around)
+             ((eq (get sym 'luna-method-qualifier) :around)

               (cons sym (luna-class-find-parents-functions class service)))
              (t
               (list (symbol-function sym))))
               (cons sym (luna-class-find-parents-functions class service)))
              (t
               (list (symbol-function sym))))

@@ -221,7 +221,7 @@ LUNA-CURRENT-METHOD-ARGUMENTS is arguments of the MESSAGE."
                               luna-current-method-arguments))
                  (if (symbolp luna-current-method)
                      (not (eq (get luna-current-method
                               luna-current-method-arguments))
                  (if (symbolp luna-current-method)
                      (not (eq (get luna-current-method

-                                   'luna-method-qualifier) ':around))
+                                   'luna-method-qualifier) :around))

                    t))))
     luna-previous-return-value))
 
                    t))))
     luna-previous-return-value))
 

@@ -241,7 +241,7 @@ LUNA-CURRENT-METHOD-ARGUMENTS is arguments of the MESSAGE."
                               luna-current-method-arguments))
                  (if (symbolp luna-current-method)
                      (not (eq (get luna-current-method
                               luna-current-method-arguments))
                  (if (symbolp luna-current-method)
                      (not (eq (get luna-current-method

-                                   'luna-method-qualifier) ':around))
+                                   'luna-method-qualifier) :around))

                    t))))
     luna-previous-return-value))
 
                    t))))
     luna-previous-return-value))