Re-generate charsets. Adjust for the change of admin/charset/mapfiles/*.gz

11 files changed, 114 insertions, 75 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 7d4921887c..ef8ff5ce65 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,27 @@
+2012-10-11  Kenichi Handa  <[email protected]>
+
+	* charsets/mapconv: Adjusted for the change of mapfiles/*.gz to
+	mapfiles/*.
+
+	* charsets/gb180302.awk: Handle 4-byte sequences in the input file.
+
+	* charsets/Makefile: Be sure to call mapconv script of the current
+	directory.  Adjusted for the change of mapfiles/*.gz to
+	mapfiles/*.
+	(SED_SCRIPT): New variable.
+	(jisx2131-filter): New target.
+	(JISX2131.map): Use jisx2131-filter to filter out characters added
+	for the 2004 year version.
+	(clear): Remove ${SED_SCRIPT} too.
+
+	* charsets/mapfiles/MULE-ethiopic.map,
+	charsets/mapfiles/MULE-ipa.map,
+	charsets/mapfiles/MULE-is13194.map,
+	charsets/mapfiles/MULE-lviscii.map,
+	charsets/mapfiles/MULE-sisheng.map,
+	charsets/mapfiles/MULE-tibetan.map,
+	charsets/mapfiles/MULE-uviscii.map: Fix typo.
+
 2012-10-07  Glenn Morris  <[email protected]>
 
 	* admin.el (cusver-new-version): Set default.
diff --git a/admin/charsets/Makefile b/admin/charsets/Makefile
index b16e7ccd74..91f541979d 100644
--- a/admin/charsets/Makefile
+++ b/admin/charsets/Makefile
@@ -77,6 +77,7 @@ MULE =	MULE-ethiopic.map MULE-ipa.map MULE-is13194.map \
 	MULE-lviscii.map MULE-uviscii.map
 
 TRANS_TABLE = cp51932.el eucjp-ms.el
+SED_SCRIPT = jisx2131-filter
 
 all: ${CHARSETS} ${TRANS_TABLE}
 
@@ -86,11 +87,11 @@ AWK = gawk
 
 VSCII.map: ${GLIBC_CHARMAPS}/TCVN5712-1.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[0-9a-f].[ 	]/' GLIBC-1 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x[0-9a-f].[ 	]/' GLIBC-1 compact.awk > $@
 
 VSCII-2.map: ${GLIBC_CHARMAPS}/TCVN5712-1.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[2-7a-f].[ 	]/' GLIBC-1 compact.awk \
+	@./mapconv $< '/^<.*[ 	]\/x[2-7a-f].[ 	]/' GLIBC-1 compact.awk \
 	  | sed 's/0x20-0x7F.*/0x00-0x7F 0x0000/' > $@
 
 ALTERNATIVNYJ.map: IBM866.map
@@ -110,45 +111,45 @@ ALTERNATIVNYJ.map: IBM866.map
 	     -e '/0xFA/ s/ .*/ 0x00B1/' \
 	     -e '/0xFB/ s/ .*/ 0x00F7/' < $< >> $@
 
-MIK.map: mapfiles/bulgarian-mik.txt.gz mapconv compact.awk
+MIK.map: mapfiles/bulgarian-mik.txt mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '1,$$' CZYBORRA compact.awk > $@
+	@./mapconv $< '1,$$' CZYBORRA compact.awk > $@
 
-PTCP154.map: mapfiles/PTCP154.gz mapconv compact.awk
+PTCP154.map: mapfiles/PTCP154 mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^0x/' IANA compact.awk > $@
+	@./mapconv $< '/^0x/' IANA compact.awk > $@
 
-stdenc.map: mapfiles/stdenc.txt.gz mapconv compact.awk
+stdenc.map: mapfiles/stdenc.txt mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^[0-9A-Fa-f]/' UNICODE compact.awk > $@
+	@./mapconv $< '/^[0-9A-Fa-f]/' UNICODE compact.awk > $@
 
-symbol.map: mapfiles/symbol.txt.gz mapconv compact.awk
+symbol.map: mapfiles/symbol.txt mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^[0-9A-Fa-f]/' UNICODE compact.awk > $@
+	@./mapconv $< '/^[0-9A-Fa-f]/' UNICODE compact.awk > $@
 
-CP720.map: mapfiles/CP720.map.gz
+CP720.map: mapfiles/CP720.map
 	# Generating $@...
-	@zcat $< > $@
+	@cp $< $@
 
-CP858.map: mapfiles/CP858.map.gz
+CP858.map: mapfiles/CP858.map
 	# Generating $@...
-	@zcat $< > $@
+	@cp $< $@
 
 CP949-2BYTE.map: ${GLIBC_CHARMAPS}/CP949.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[89a-f]/' GLIBC-2 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x[89a-f]/' GLIBC-2 compact.awk > $@
 
 GB2312.map: ${GLIBC_CHARMAPS}/GB2312.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2-7 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2-7 compact.awk > $@
 
 GBK.map: ${GLIBC_CHARMAPS}/GBK.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[89a-f]/' GLIBC-2 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x[89a-f]/' GLIBC-2 compact.awk > $@
 
 GB180302.map: ${GLIBC_CHARMAPS}/GB18030.gz mapconv gb180302.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x..\/x..[ 	]/' GLIBC-2 gb180302.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x..\/x..[ 	]/' GLIBC-2 gb180302.awk > $@
 
 GB180304.map: GB180302.map gb180304.awk
 	# Generating $@...
@@ -156,35 +157,39 @@ GB180304.map: GB180302.map gb180304.awk
 
 JISX0201.map: ${GLIBC_CHARMAPS}/JIS_X0201.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[0-9]/' GLIBC-1 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x[0-9]/' GLIBC-1 compact.awk > $@
 	@echo "# Generated by hand" >> $@
 	@echo "0xA1-0xDF 0xFF61" >> $@
 
 JISX0208.map: ${GLIBC_CHARMAPS}/EUC-JP.gz mapconv
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2-7 \
+	@./mapconv $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2-7 \
 	  | sed 's/0x2015/0x2014/' > $@
 
 JISX0212.map: ${GLIBC_CHARMAPS}/EUC-JP.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x8f/ s,/x8f,,' GLIBC-2-7 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x8f/ s,/x8f,,' GLIBC-2-7 compact.awk > $@
 
-JISX2131.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz mapconv
+jisx2131-filter: mapfiles/JISX213A.map
+	@sed -n -e '/^#/d' -e 's,.*0x\([0-9A-Z]*\)$$,/0x0*\1$$/d,p' < $< > $@
+
+JISX2131.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz mapconv jisx2131-filter
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2-7 \
+	@./mapconv $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2-7 \
+	  | sed -f jisx2131-filter \
 	  | sed -e 's/0x2015/0x2014/' -e 's/0x2299/0x29BF/' > $@
 
 JISX2132.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz mapconv
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x8f/ s,/x8f,,' GLIBC-2-7 > $@
+	@./mapconv $< '/^<.*[ 	]\/x8f/ s,/x8f,,' GLIBC-2-7 > $@
 
-JISX213A.map: mapfiles/JISX213A.map.gz
+JISX213A.map: mapfiles/JISX213A.map
 	# Generating $@
-	@zcat $< > $@
+	@cp $<  $@
 
-CP932-2BYTE.map: mapfiles/CP932.TXT.gz mapconv cp932.awk
+CP932-2BYTE.map: mapfiles/CP932.TXT mapconv cp932.awk
 	# Generating $@...
-	@mapconv $< '/^0x[89A-F][0-9A-F][0-9A-F]/' UNICODE2 cp932.awk > $@
+	@./mapconv $< '/^0x[89A-F][0-9A-F][0-9A-F]/' UNICODE2 cp932.awk > $@
 
 cp51932.el: CP932-2BYTE.map cp51932.awk
 	@$(AWK) -f cp51932.awk < CP932-2BYTE.map > $@
@@ -192,17 +197,17 @@ cp51932.el: CP932-2BYTE.map cp51932.awk
 eucjp-ms.el: ${GLIBC_CHARMAPS}/EUC-JP-MS.gz eucjp-ms.awk
 	@zcat $< | $(AWK) -f eucjp-ms.awk > $@
 
-JISC6226.map : mapfiles/Uni2JIS.gz mapconv kuten.awk
+JISC6226.map : mapfiles/Uni2JIS mapconv kuten.awk
 	# Generating $@...
-	@mapconv $< '/^[^#].*0-/' YASUOKA kuten.awk > $@
+	@./mapconv $< '/^[^#].*0-/' YASUOKA kuten.awk > $@
 
 KSC5601.map: ${GLIBC_CHARMAPS}/EUC-KR.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2-7 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2-7 compact.awk > $@
 
 BIG5.map: ${GLIBC_CHARMAPS}/BIG5.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2 > $@
+	@./mapconv $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2 > $@
 
 BIG5-1.map: BIG5.map mapconv big5.awk
 	# Generating $@...
@@ -216,52 +221,52 @@ BIG5-2.map: BIG5.map mapconv big5.awk
 
 BIG5-HKSCS.map: ${GLIBC_CHARMAPS}/BIG5-HKSCS.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[89a-f].\//' GLIBC-2 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x[89a-f].\//' GLIBC-2 compact.awk > $@
 
 JOHAB.map: ${GLIBC_CHARMAPS}/JOHAB.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[89a-f]/' GLIBC-2 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x[89a-f]/' GLIBC-2 compact.awk > $@
 
 CNS-1.map: ${GLIBC_CHARMAPS}/EUC-TW.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2-7 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x[a-f]/' GLIBC-2-7 compact.awk > $@
 
 # CNS-1.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
 # 	# Generating $@...
-# 	@mapconv $< '/^C1/' KANJI-DATABASE compact.awk > $@
+# 	@./mapconv $< '/^C1/' KANJI-DATABASE compact.awk > $@
 
-CNS-2.map: mapfiles/cns2ucsdkw.txt.gz mapconv compact.awk
+CNS-2.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^C2/' KANJI-DATABASE compact.awk > $@
+	@./mapconv $< '/^C2/' KANJI-DATABASE compact.awk > $@
 
-CNS-3.map: mapfiles/cns2ucsdkw.txt.gz mapconv compact.awk
+CNS-3.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^C3/' KANJI-DATABASE compact.awk > $@
+	@./mapconv $< '/^C3/' KANJI-DATABASE compact.awk > $@
 
-CNS-4.map: mapfiles/cns2ucsdkw.txt.gz mapconv compact.awk
+CNS-4.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^C4/' KANJI-DATABASE compact.awk > $@
+	@./mapconv $< '/^C4/' KANJI-DATABASE compact.awk > $@
 
-CNS-5.map: mapfiles/cns2ucsdkw.txt.gz mapconv compact.awk
+CNS-5.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^C5/' KANJI-DATABASE compact.awk > $@
+	@./mapconv $< '/^C5/' KANJI-DATABASE compact.awk > $@
 
-CNS-6.map: mapfiles/cns2ucsdkw.txt.gz mapconv compact.awk
+CNS-6.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^C6/' KANJI-DATABASE compact.awk > $@
+	@./mapconv $< '/^C6/' KANJI-DATABASE compact.awk > $@
 
-CNS-7.map: mapfiles/cns2ucsdkw.txt.gz mapconv compact.awk
+CNS-7.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^C7/' KANJI-DATABASE compact.awk > $@
+	@./mapconv $< '/^C7/' KANJI-DATABASE compact.awk > $@
 
 CNS-F.map: ${GLIBC_CHARMAPS}/EUC-TW.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*\/x8e\/xaf/ s,/x8e/xaf,,' GLIBC-2-7 compact.awk > $@
+	@./mapconv $< '/^<.*\/x8e\/xaf/ s,/x8e/xaf,,' GLIBC-2-7 compact.awk > $@
 
 # General target to produce map files for mule charsets.
-MULE-%.map: mapfiles/MULE-%.map.gz
+MULE-%.map: mapfiles/MULE-%.map
 	# Generating $@...
-	@zcat $< > $@
+	@cp $< $@
 
 # General target to produce map files for ISO-8859, GEORGIAN, and
 # EBCDIC charsets.  We can not use the original file name because of
@@ -269,21 +274,21 @@ MULE-%.map: mapfiles/MULE-%.map.gz
 
 8859-%.map: ${GLIBC_CHARMAPS}/ISO-8859-%.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x/' GLIBC-1 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x/' GLIBC-1 compact.awk > $@
 
 KA-%.map: ${GLIBC_CHARMAPS}/GEORGIAN-%.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x/' GLIBC-1 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x/' GLIBC-1 compact.awk > $@
 
 EBCDIC%.map: ${GLIBC_CHARMAPS}/EBCDIC-%.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x/' GLIBC-1 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x/' GLIBC-1 compact.awk > $@
 
 # General target to produce map files for single-byte charsets.
 
 %.map: ${GLIBC_CHARMAPS}/%.gz mapconv compact.awk
 	# Generating $@...
-	@mapconv $< '/^<.*[ 	]\/x/' GLIBC-1 compact.awk > $@
+	@./mapconv $< '/^<.*[ 	]\/x/' GLIBC-1 compact.awk > $@
 
 install:
 	@for f in ${CHARSETS}; do \
@@ -305,5 +310,5 @@ install:
 
 # Clear files that are automatically generated.
 clean:
-	rm -f ${CHARSETS} ${TRANS_TABLE}
+	rm -f ${CHARSETS} ${TRANS_TABLE} ${SED_SCRIPT}
 
diff --git a/admin/charsets/gb180302.awk b/admin/charsets/gb180302.awk
index 6cd9521ce9..40d92bf9be 100644
--- a/admin/charsets/gb180302.awk
+++ b/admin/charsets/gb180302.awk
@@ -74,19 +74,30 @@ function index_to_gb(idx) {
 
 {
   gb = gb_to_index(decode_hex(substr($1, 3, 4)));
-  unicode = decode_hex(substr($2, 3, 4));
+  unicode = decode_hex(substr($2, 3));
   if ((gb == to_gb + 1) && (unicode == to_unicode + 1))
     {
       to_gb++;
       to_unicode++;
     }
-  else
+  else if (gb > to_gb) # ignore the case gb == to_gb that is a duplication
     {
       if (from_gb == to_gb)
-	printf "0x%04X 0x%04X\n", index_to_gb(from_gb), from_unicode;
+        {
+	  if (from_unicode <= 65535)
+	    printf "0x%04X 0x%04X\n", index_to_gb(from_gb), from_unicode;
+	  else
+	    printf "0x%04X 0x%08X\n", index_to_gb(from_gb), from_unicode;
+	}
       else if (from_gb < to_gb)
-	printf "0x%04X-0x%04X 0x%04X\n",
-	  index_to_gb(from_gb), index_to_gb(to_gb), from_unicode;
+        {
+	  if (from_unicode <= 65535)
+	    printf "0x%04X-0x%04X 0x%04X\n",
+		index_to_gb(from_gb), index_to_gb(to_gb), from_unicode;
+	  else
+	    printf "0x%04X-0x%04X 0x%08X\n",
+		index_to_gb(from_gb), index_to_gb(to_gb), from_unicode;
+	}
       from_gb = to_gb = gb;
       from_unicode = to_unicode = unicode;
     }
diff --git a/admin/charsets/mapconv b/admin/charsets/mapconv
index 4f7a8b96f5..8433d222b8 100755
--- a/admin/charsets/mapconv
+++ b/admin/charsets/mapconv
@@ -98,18 +98,17 @@ elif [ "$3" = "GLIBC-2-7" ] ; then
 	| sed -e 's/xa/x2/g' -e 's/xb/x3/g' -e 's/xc/x4/g' \
 	      -e 's/xd/x5/g' -e 's/xe/x6/g' -e 's/xf/x7/g' \
 	      -e 's,<U\([^>]*\)>[ 	]*/x\(..\)/x\(..\).*,0x\2\3 0x\1,' \
-	| tee temp \
 	| sort | ${AWKPROG}
 elif [ "$3" = "CZYBORRA" ] ; then
     # Source format is:
     #   =XX	U+YYYY
-    zcat $1 | sed -n -e "$2 p" \
+    sed -n -e "$2 p" < $1 \
 	| sed -e 's/=\(..\)[^U]*U+\([0-9A-F]*\).*/0x\1 0x\2/' \
 	| sort | ${AWKPROG}
 elif [ "$3" = "IANA" ] ; then
     # Source format is:
     #   0xXX	0xYYYY
-    zcat $1 | sed -n -e "$2 p" \
+    sed -n -e "$2 p" < $1 \
 	| sed -e 's/\(0x[0-9A-Fa-f]*\)[^0]*\(0x[0-9A-Fa-f]*\).*/\1 \2/' \
 	| sort | ${AWKPROG}
 elif [ "$3" = "UNICODE" ] ; then
@@ -117,25 +116,25 @@ elif [ "$3" = "UNICODE" ] ; then
     #   YYYY	XX
     # We perform reverse sort to prefer the first one in the
     # duplicated mappings (e.g. 0x20->U+0020, 0x20->U+00A0).
-    zcat $1 | sed -n -e "$2 p" \
+    sed -n -e "$2 p" < $1 \
 	| sed -e 's/\([0-9A-F]*\)[^0-9A-F]*\([0-9A-F]*\).*/0x\2 0x\1/' \
 	| sort -r
 elif [ "$3" = "UNICODE2" ] ; then
     # Source format is:
     #   0xXXXX	0xYYYY	# ...
-    zcat $1 | sed -n -e "$2 p" \
+    sed -n -e "$2 p" < $1 \
 	| sed -e 's/\([0-9A-Fx]*\)[^0]*\([0-9A-Fx]*\).*/\1 \2/' \
 	| ${AWKPROG} | sort -n -k 4,4
 elif [ "$3" = "YASUOKA" ] ; then
     # Source format is:
     # YYYY	0-XXXX (XXXX is a Kuten code)
-    zcat $1 | sed -n -e "$2 p" \
+    sed -n -e "$2 p" < $1 \
 	| sed -e 's/\([0-9A-F]*\)[^0]*0-\([0-9]*\).*/0x\2 0x\1/' \
 	| sort | ${AWKPROG}
 elif [ "$3" = "KANJI-DATABASE" ] ; then
     # Source format is:
     # C?-XXXX U+YYYYY .....
-    zcat $1 | sed -n -e "$2 p" \
+    sed -n -e "$2 p" < $1 \
 	| sed -e 's/...\(....\) U+\([0-9A-F]*\).*/0x\1 0x\2/' \
 	| sort | ${AWKPROG}
 else
diff --git a/admin/charsets/mapfiles/MULE-ethiopic.map b/admin/charsets/mapfiles/MULE-ethiopic.map
index d2720bd10b..30cf573676 100644
--- a/admin/charsets/mapfiles/MULE-ethiopic.map
+++ b/admin/charsets/mapfiles/MULE-ethiopic.map
@@ -1,4 +1,4 @@
-# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
+# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
 0x2121 0x1200
 0x2122 0x1201
 0x2123 0x1202
diff --git a/admin/charsets/mapfiles/MULE-ipa.map b/admin/charsets/mapfiles/MULE-ipa.map
index 35e5d50ece..0a6c61d5a9 100644
--- a/admin/charsets/mapfiles/MULE-ipa.map
+++ b/admin/charsets/mapfiles/MULE-ipa.map
@@ -1,4 +1,4 @@
-# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
+# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
 0x20 0x0069
 0x21 0x026A
 0x22 0x0065
diff --git a/admin/charsets/mapfiles/MULE-is13194.map b/admin/charsets/mapfiles/MULE-is13194.map
index 1fa9b21dcf..390132cd37 100644
--- a/admin/charsets/mapfiles/MULE-is13194.map
+++ b/admin/charsets/mapfiles/MULE-is13194.map
@@ -1,4 +1,4 @@
-# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
+# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
 0x21 0x0901
 0x22 0x0902
 0x23 0x0903
diff --git a/admin/charsets/mapfiles/MULE-lviscii.map b/admin/charsets/mapfiles/MULE-lviscii.map
index 3b6a38be61..e4d2eca90a 100644
--- a/admin/charsets/mapfiles/MULE-lviscii.map
+++ b/admin/charsets/mapfiles/MULE-lviscii.map
@@ -1,4 +1,4 @@
-# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
+# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
 0x21 0x1EAF
 0x22 0x1EB1
 0x23 0x1EB7
diff --git a/admin/charsets/mapfiles/MULE-sisheng.map b/admin/charsets/mapfiles/MULE-sisheng.map
index 405bb1ffa2..144a3ff513 100644
--- a/admin/charsets/mapfiles/MULE-sisheng.map
+++ b/admin/charsets/mapfiles/MULE-sisheng.map
@@ -1,4 +1,4 @@
-# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
+# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
 0x21 0x0101
 0x22 0x00E1
 0x23 0x01CE
diff --git a/admin/charsets/mapfiles/MULE-tibetan.map b/admin/charsets/mapfiles/MULE-tibetan.map
index 0d6ff3a0a3..b885585c09 100644
--- a/admin/charsets/mapfiles/MULE-tibetan.map
+++ b/admin/charsets/mapfiles/MULE-tibetan.map
@@ -1,4 +1,4 @@
-# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
+# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
 0x2130 0x0F00
 0x2131 0x0F01
 0x2132 0x0F02
diff --git a/admin/charsets/mapfiles/MULE-uviscii.map b/admin/charsets/mapfiles/MULE-uviscii.map
index 65e5d2968e..dc19583bdf 100644
--- a/admin/charsets/mapfiles/MULE-uviscii.map
+++ b/admin/charsets/mapfiles/MULE-uviscii.map
@@ -1,4 +1,4 @@
-# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
+# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
 0x21 0x1EAE
 0x22 0x1EB0
 0x23 0x1EB6