Merge apel-shubit.

diff --git a/README.en b/README.en
index 98d5e51..b8040c2 100644 (file)
--- a/README.en
+++ b/README.en
@@ -159,8 +159,8 @@ load-path (for Emacs or MULE)
 =============================
 
   If you are using Emacs or Mule, please add directory of apel to
 =============================
 
   If you are using Emacs or Mule, please add directory of apel to

-  load-path.  If you install by default setting with Emacs 20.1/20.2,
-  you can write subdirs.el for example:
+  load-path.  If you install by default setting with Emacs 19.29 or
+  later or Emacs 20.1/20.2, you can write subdirs.el for example:

 
   --------------------------------------------------------------------
   (normal-top-level-add-to-load-path '("apel"))
 
   --------------------------------------------------------------------
   (normal-top-level-add-to-load-path '("apel"))

diff --git a/README.ja b/README.ja
index fce12d2..1ab3978 100644 (file)
--- a/README.ja
+++ b/README.ja
@@ -163,27 +163,99 @@ load-path\e$B!J\e(BEmacs \e$B$H\e(B MULE \e$B$N>l9g!K\e(B
 ================================
 
   \e$B$b$7\e(B Emacs \e$B$b$7$/$O\e(B Mule \e$B$r$*;H$$$J$i!"\e(BAPEL \e$B$r\e(B install \e$B$7$?>l=j$r\e(B
 ================================
 
   \e$B$b$7\e(B Emacs \e$B$b$7$/$O\e(B Mule \e$B$r$*;H$$$J$i!"\e(BAPEL \e$B$r\e(B install \e$B$7$?>l=j$r\e(B

-  load-path \e$B$KDI2C$7$F$/$@$5$$!#$b$7=i4|@_Dj$G%$%s%9%H!<%k$7$?$N$J$i!"\e(B
-  \e$B<!$N$h$&$K\e(B subdirs.el \e$B$r=q$/$3$H$,$G$-$^$9!#\e(B
-
-  \e$BNc\e(B:
+  load-path \e$B$KDI2C$7$F$/$@$5$$!#$b$7\e(B Emacs 19.29 \e$B0J9_$^$?$O\e(B Emacs 20.1,
+  20.2 \e$B$r;H$C$F=i4|@_Dj$G%$%s%9%H!<%k$7$?$N$J$i!"<!$N$h$&$K\e(B subdirs.el
+  \e$B$r=q$/$3$H$,$G$-$^$9!#\e(B

 
   --------------------------------------------------------------------
   (normal-top-level-add-to-load-path '("apel"))
   --------------------------------------------------------------------
 
 
   --------------------------------------------------------------------
   (normal-top-level-add-to-load-path '("apel"))
   --------------------------------------------------------------------
 

-  \e$B$b$7?7$7$$\e(B CUSTOM, \e$BNc$($P\e(B v1.9962 \e$B$r$*;H$$$J$i!"\e(Bmake \e$B$9$kA0$K$=$l$,\e(B
-  \e$B%$%s%9%H!<%k$5$l$F$$$k>l=j$rF1MM$NJ}K!$G;XDj$7$F$*$/$3$H$r$*4+$a$7$^\e(B
-  \e$B$9!#\e(B
+  \e$B$b$7\e(B Emacs 20.3 \e$B0J9_$b$7$/$O\e(B XEmacs \e$B$r;H$C$FIaDL$K%$%s%9%H!<%k$9$k$N\e(B
+  \e$B$J$i$P!"\e(Bload-path \e$B$r@_Dj$9$kI,MW$O$"$j$^$;$s!#\e(B

 
 

-  \e$BNc\e(B:

 
 

-  --------------------------------------------------------------------
-  (normal-top-level-add-to-load-path '("custom" "apel"))
-  --------------------------------------------------------------------
+Emacs \e$B$N%P!<%8%g%s$K4XO"$7$?>pJs\e(B
+================================
+
+\e$B!V8E$$\e(B byte-compiler\e$B!W$H!V?7$7$$\e(B byte-compiler\e$B!W\e(B
+Emacs 18 \e$B$N%f!<%6$N$_$J$5$s$X\e(B:
+
+  \e$B$3$N%Q%C%1!<%8$G$O%3%s%Q%$%k;~$K$*$1$k>r7oH=CG$r$?$/$5$s9T$J$C$F$$$^\e(B
+  \e$B$9!#;DG0$J$,$i\e(B Emacs 18 \e$B$KIUB0$7$F$$$k\e(B byte-compiler \e$B$K$O!"Nc$($P\e(B
+  `eval-when-compile' \e$B$d\e(B `eval-and-compile' \e$B$N5!G=$,L5$$$N$GBeMQIJ$N%^\e(B
+  \e$B%/%m$rMQ0U$7$F$"$j$^$9$,!"$3$l$i$O%3%s%Q%$%k;~$@$1$G$J$/\e(B load \e$B;~$^$?\e(B
+  \e$B$O<B9T;~$K$bF/$$$F$7$^$$$^$9\e(B!   \e$B2C$($F!V8E$$\e(B byte-compiler\e$B!W$O%H%C%W\e(B
+  \e$B%l%Y%k$N%^%/%m$r%3%s%Q%$%k$7$F$/$l$J$$$N$G!"\e(BAPEL \e$B$NB?$/$N%3!<%I$,%3\e(B
+  \e$B%s%Q%$%k$5$l$J$$$^$^$K$J$C$F$7$^$$$^$9!#\e(B
+
+  \e$B$=$3$G!":GE,2=$r9T$J$&!V?7$7$$\e(B byte-compiler\e$B!W$r;H$&$3$H$r$*4+$a$7$^\e(B
+  \e$B$9!#$=$l$O\e(B Emacs 19 \e$B0J9_$KIUB0$7$F$$$k\e(B byte-compiler \e$B$N85$K$J$C$F$$\e(B
+  \e$B$k$b$N$G$9!#\e(B
+
+  \e$B:GE,2=$r9T$J$&\e(B byte-compiler \e$B$O\e(B Emacs Lisp Archive \e$B$*$h$S$=$l$i$N%_\e(B
+  \e$B%i!<$+$iF~<j$9$k$3$H$,$G$-$^$9!#\e(B
+
+  Mule 1.* \e$B$N;~Be$K$O\e(B Mule \e$BMQ$N!V?7$7$$\e(B byte-compiler\e$B!W$r4^$`\e(B Mule 1.*
+  \e$BMQ$N\e(B "contrib" \e$B%Q%C%1!<%8$,G[I[$5$l$F$$$^$7$?!#$7$+$78=:_$G$O$3$N%Q%C\e(B
+  \e$B%1!<%8$r<j$KF~$l$k$3$H$OFq$7$$$G$7$g$&!#\e(B
+
+  \e$B2f!9$NCN$k8B$j$G$O\e(B Emacs 18 \e$BMQ$N!V?7$7$$\e(B byte-compiler\e$B!W$O\e(B SKK 9.6
+  \e$B$KIUB0$7$F$$$^$9!#$3$l$O\e(B Mule 1.* \e$BMQ$N%Q%C%A$b4^$s$G$$$^$9!#\e(B
+

 
 

-  \e$B$b$7\e(B Emacs 20.3 \e$B0J9_$b$7$/$O\e(B XEmacs \e$B$r$*;H$$$J$i!"\e(Bload-path \e$B$r@_Dj$9\e(B
-  \e$B$kI,MW$O$"$j$^$;$s!#\e(B
+\e$B!V8E$$\e(B custom\e$B!W$H!V?7$7$$\e(B custom\e$B!W\e(B
+Emacs 19.34 \e$B$H\e(B XEmacs 19.14 \e$B$N%f!<%6$N$_$J$5$s$X\e(B:
+
+  Emacs 19.32\e$B!A\e(B19.34\e$B!"\e(BXEmacs 19.14 \e$B$*$h$S\e(B Gnus 5.2/5.3 \e$B$K4^$^$l$F$$$k\e(B
+  custom \e$B%i%$%V%i%j$O!V8E$$!W$b$N$G!"$3$l$N\e(B API \e$B$O\e(B Emacs 20.1 \e$B$^$?$O\e(B
+  XEmacs 19.15 \e$B$h$j?7$7$$\e(B Emacsen \e$B$H\e(B Gnus 5.4/5.5 \e$B$K4^$^$l$F$$$k\e(B
+  \e$B!V?7$7$$\e(B custom\e$B!W$H$O0c$C$F$$$^$9!#\e(B
+
+  Emacs 19.34 \e$B$H\e(B XEmacs 19.15\e$B!A\e(B20.2 \e$BMQ$N!V?7$7$$\e(B custom\e$B!W$O!"0J2<$N\e(B
+  URL \e$B$+$i<j$KF~$l$k$3$H$,$G$-$^$9!#\e(B
+
+  ftp://ftp.dina.kvl.dk/pub/Staff/Per.Abrahamsen/custom/custom-1.9962.tar.gz
+
+  (\e$BCm\e(B: XEmacs 19.15\e$B!A\e(B20.2 \e$B$H\e(B Gnus 5.4/5.5 \e$B$K4^$^$l$F$$$k!V?7$7$$\e(B
+       custom\e$B!W$O$3$NHG$h$j8E$$$b$N$G$9!#\e(B)
+
+  \e$B!V?7$7$$\e(B custom\e$B!W$r%$%s%9%H!<%k$9$kA0$K!"<!$N3F9`L\$r%A%'%C%/$7$F2<\e(B
+  \e$B$5$$!#\e(B
+
+    1) \e$B$b$7$"$J$?$,\e(B Gnus 5.2/5.3 (\e$B$^$?$OB>$N!V8E$$\e(B custom\e$B!W$r;H$&%"%W\e(B
+       \e$B%j%1!<%7%g%s\e(B) \e$B$r;H$&$3$H$K8G<9$7$F$$$k$N$J$i$P!V?7$7$$\e(B custom\e$B!W\e(B
+       \e$B$r%$%s%9%H!<%k$7$F$O$$$1$^$;$s!#\e(B
+
+    2) Emacs 19 \e$B$r85$K$7$?\e(B Mule \e$B$r;H$&$N$J$i$P!"$3$N%Q%C%A$r!V?7$7$$\e(B
+       custom\e$B!W$KEv$F$kI,MW$,$"$j$^$9!#\e(B
+
+----8<------8<------8<------8<------8<------8<------8<------8<----
+--- custom-1.9962/cus-face.el~ Wed Mar  4 19:52:39 1998
++++ custom-1.9962/cus-face.el  Mon Mar  9 08:05:33 1998
+@@ -96,7 +96,7 @@
+       "Define a new FACE on all frames, ignoring X resources."
+       (interactive "SMake face: ")
+       (or (internal-find-face name)
+-        (let ((face (make-vector 8 nil)))
++        (let ((face (make-vector face-vector-length nil)))
+           (aset face 0 'face)
+           (aset face 1 name)
+           (let* ((frames (frame-list))
+----8<------8<------8<------8<------8<------8<------8<------8<----
+
+    3) custom \e$B$r;H$&%3%s%Q%$%k$5$l$?%"%W%j%1!<%7%g%s$O!"$=$l$r\e(B load \e$B$9\e(B
+       \e$B$k$H$-$d<B9T$9$k$H$-$KF1$8%P!<%8%g%s$N\e(B custom \e$B$rI,MW$H$7$^$9!#\e(B
+       \e$B$7$?$,$C$F!"$$$D$b\e(B load-path \e$B$K!V?7$7$$\e(B custom\e$B!W$r4^$a$F$*$+$J\e(B
+       \e$B$1$l$P$J$j$^$;$s!#\e(B
+       \e$B$3$l$r9T$J$&$?$a$N$b$C$H$b4JC1$JJ}K!$O\e(B subdirs.el \e$B$r;H$&$3$H$G\e(B
+       \e$B$9!#\e(B
+       \e$B!V?7$7$$\e(B custom\e$B!W$,\e(B /usr/local/share/emacs/19.34/site-lisp/custom/
+       \e$B$K%$%s%9%H!<%k$5$l$F$$$k$N$J$i$P!"\e(B
+       /usr/local/share/emacs/19.34/site-lisp/subdirs.el \e$B$H$$$&%U%!%$\e(B
+       \e$B%k$K0J2<$N9T$r=q$-9~$s$G2<$5$$!#\e(B
+
+       (normal-top-level-add-to-load-path '("custom"))

 
 
 \e$B;H$$J}\e(B
 
 
 \e$B;H$$J}\e(B

@@ -315,18 +387,18 @@ filename
 \e$B%P%0Js9p\e(B
 ===========
 
 \e$B%P%0Js9p\e(B
 ===========
 

-  \e$B%P%0Js9p$d2~A1$NDs0F$r=q$$$?$H$-$O!"@'Hs\e(B tm \e$B%a!<%j%s%0%j%9%H$KAw$C$F\e(B
-  \e$B$/$@$5$$\e(B:
+  \e$B%P%0Js9p$d2~A1$NDs0F$r=q$$$?$H$-$O!"@'Hs\e(B APEL \e$B%a!<%j%s%0%j%9%H$KAw$C\e(B
+  \e$B$F$/$@$5$$\e(B:

 
 

-       bug-tm-en@chamonix.jaist.ac.jp  (\e$B1Q8l\e(B)
-       bug-tm-ja@chamonix.jaist.ac.jp  (\e$BF|K\8l\e(B)
+       apel-en@m17n.org        (\e$B1Q8l\e(B)
+       apel-ja@m17n.org        (\e$BF|K\8l\e(B)

 
 

-  tm ML \e$B$rDL$7$F!"\e(BAPEL \e$B$N%P%0$rJs9p$7$?$j!"\e(BAPEL \e$B$N:G?7$N%j%j!<%9$r<hF@\e(B
-  \e$B$7$?$j!"\e(BAPEL \e$B$N>-Mh$N3HD%$N5DO@$r$7$?$j$9$k$3$H$,$G$-$^$9!#\e(Btm ML \e$B$K\e(B
-  \e$B;22C$9$k$K$O!"6u$NEE;R%a!<%k$r\e(B
+  APEL ML \e$B$rDL$7$F!"\e(BAPEL \e$B$N%P%0$rJs9p$7$?$j!"\e(BAPEL \e$B$N:G?7$N%j%j!<%9$r<h\e(B
+  \e$BF@$7$?$j!"\e(BAPEL \e$B$N>-Mh$N3HD%$N5DO@$r$7$?$j$9$k$3$H$,$G$-$^$9!#\e(BAPEL ML
+  \e$B$K;22C$9$k$K$O!"6u$NEE;R%a!<%k$r\e(B

 
 

-       tm-en-help@chamonix.jaist.ac.jp (\e$B1Q8l\e(B)
-       tm-ja-help@chamonix.jaist.ac.jp (\e$BF|K\8l\e(B)
+       apel-en-ctl@m17n.org    (\e$B1Q8l\e(B)
+       apel-ja-ctl@m17n.org    (\e$BF|K\8l\e(B)

 
   \e$B$KAw$C$F$/$@$5$$!#\e(B
 
 
   \e$B$KAw$C$F$/$@$5$$!#\e(B