(mac_aelist_to_lisp, mac_aedesc_to_lisp): Change arg 1 to

[gnu-emacs] / etc / TUTORIAL.ja

diff --git a/etc/TUTORIAL.ja b/etc/TUTORIAL.ja
index 683a4f485c8905f1d60aee9e25d71eee693f5f1f..826a175e8c67b34b86486b854e83cd652a49e92f 100644 (file)
--- a/etc/TUTORIAL.ja
+++ b/etc/TUTORIAL.ja
@@ -1,5 +1,4 @@
-Emacs \e$BF~Lg%,%$%I\e(B.
-Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation.
+Emacs \e$BF~Lg%,%$%I\e(B.  \e$BK\%U%!%$%k$NCx:n8"$K$D$$$F$O:G8e$r8fMw2<$5$$!#\e(B
 
 Emacs \e$B$N%3%^%s%I$rF~NO$9$k$K$O!"0lHL$K%3%s%H%m!<%k%-!<!J%-!<%H%C%W$K\e(B
 CONTROL \e$B$H$+\e(B CTRL \e$B$H$+\e(B CTL \e$B$H=q$$$F$"$k!K$d%a%?%-!<!J%-!<%H%C%W$K\e(B META
@@ -372,7 +371,7 @@ C-k \e$B$O#2$D$N9T$H$=$l$>$l$KB3$/2~9TJ8;z$r>C$7$^$9$,!"\e(BC-k \e$B$r#2EY%?%$%W$7\e
 
 \e$B>C5n$7$?J8>O$rI|3h$5$;$kA`:n$r:FF~!J\e(Byanking\e$B!K$H8F$S$^$9!#>C$7$?J8>O$O!"\e(B
 \e$B85$HF1$8>l=j$K$G$b85$H$O0c$&>l=j$K$G$b!"$5$i$K$OJL$N%U%!%$%k$K$b:FF~$G\e(B
-\e$B$-$^$9!#$^$?!"2?EY$b:FF~$7$FJ8>O$N%3%T!<$rJ#?t:n$k$3$H$b$G$-$^$9!#\e(B
+\e$B$-$^$9!#$^$?!"2?EY$b:FF~$9$k$3$H$GJ8>O$N%3%T!<$rJ#?t:n$k$3$H$b$G$-$^$9!#\e(B
 
 \e$B:FF~$N$?$a$N%3%^%s%I$O\e(B C-y \e$B$G$9!#$3$l$O!":G8e$K>C5n$7$?J8>O$r8=:_%+!<\e(B
 \e$B%=%k$,$"$k0LCV$K:FF~$7$^$9!#\e(B
@@ -592,7 +591,7 @@ Emacs \e$B$K$O!"%3%s%H%m!<%kJ8;z$d%a%?J8;z$K3dEv$F$i$l$k$h$j$b$:$C$H$:$C$H\e(B
 \e$B;H$$$^$9!#$=$l$K$O!"0J2<$N#2$D$N<oN`$,$"$j$^$9!#\e(B
 
      C-x     \e$BJ8;z$K$h$k3HD%!#B3$1$F0lJ8;z$rF~NO$7$^$9!#\e(B
-     ESC x   \e$BL>A0$K$h$k3HD%!#B3$1$F%3%^%s%I$NL>A0$rF~NO$7$^$9!#\e(B
+     M-x     \e$BL>A0$K$h$k3HD%!#B3$1$F%3%^%s%I$NL>A0$rF~NO$7$^$9!#\e(B
 
 \e$B$3$l$i$O!"0lHLE*$K$OJXMx$@$1$l$I$b!"$3$l$^$G8+$F$-$?$b$N$[$I$OIQHK$KMQ\e(B
 \e$B$$$i$l$J$$%3%^%s%I$G$9!#\e(BC-x C-f \e$B!J%U%!%$%k$r3+$/!K$d\e(B C-x C-s\e$B!J%U%!%$%k\e(B
@@ -1027,7 +1026,7 @@ F10 h r\e$B!K$G$"$m$&$H!"$=$l$rFI$a$P\e(B Emacs \e$B$K$D$$$F$b$C$HB?$/$r3X$Y$^$9!#\e
 \e$B!v$3$NK]LuHG$K$D$$$F$N<U<-\e(B
 ==========================
 
-\e$B$3$NJ8=q$O\e(B Emacs Ver.21 \e$BIUB0$N1Q8lHG$NF~Lg%,%$%I$rF|K\8l$KK]Lu$7$?$b$N\e(B
+\e$B$3$NJ8=q$O\e(B Emacs Ver.22 \e$BIUB0$N1Q8lHG$NF~Lg%,%$%I$rF|K\8l$KK]Lu$7$?$b$N\e(B
 \e$B$G$9!#$=$N:]!"\e(BEmacs Ver. 20 \e$BImB0$NF|K\8lHGF~Lg%,%$%I$r%Y!<%9$K$7$^$7$?!#\e(B
 Emacs Ver. 20 \e$BImB0$NF|K\8lHGF~Lg%,%$%I$O!"\e(BMule \e$BIUB0$NF|K\8l%,%$%I$r;2\e(B
 \e$B9M$K$7$?$b$N$G!"$=$N85$O\e(B SANETO Takanori \e$B;a$,F|K\8l\e(B MicroEmacs(kemacs)
@@ -1048,7 +1047,8 @@ starting with the one written by Stuart Cracraft for the original Emacs.
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
-Copyright (c) 1985, 1996, 1998, 2001, 2002 Free Software Foundation
+Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
+   2005, 2006 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the