Sync up with r21-2-47-utf-2000-0_19-b1.

[chise/xemacs-chise.git-] / lisp / mule / mule-charset.el

diff --git a/lisp/mule/mule-charset.el b/lisp/mule/mule-charset.el
index bf7fea4..7f4dfbc 100644 (file)
--- a/lisp/mule/mule-charset.el
+++ b/lisp/mule/mule-charset.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1992 Free Software Foundation, Inc.
 ;; Copyright (C) 1995 Amdahl Corporation.
 ;; Copyright (C) 1996 Sun Microsystems.
-;; Copyright (C) 1999,2000,2001 MORIOKA Tomohiko
+;; Copyright (C) 1999,2000,2001,2002 MORIOKA Tomohiko
 
 ;; Author: Unknown
 ;; Keywords: i18n, mule, internal
@@ -252,12 +252,12 @@ DESCRIPTION (string) is the description string of the charset."
 
 ;; Setup auto-fill-chars for charsets that should invoke auto-filling.
 ;; SPACE and NEWLIE are already set.
-(let ((l '(katakana-jisx0201
-          japanese-jisx0208 japanese-jisx0212
-          chinese-gb2312 chinese-big5-1 chinese-big5-2)))
-  (while l
-    (put-char-table (car l) t auto-fill-chars)
-    (setq l (cdr l))))
+;; (let ((l '(katakana-jisx0201
+;;            japanese-jisx0208 japanese-jisx0212
+;;            chinese-gb2312 chinese-big5-1 chinese-big5-2)))
+;;   (while l
+;;     (put-char-table (car l) t auto-fill-chars)
+;;     (setq l (cdr l))))
 
 
 ;;; @ Coded character set
@@ -276,11 +276,10 @@ DESCRIPTION (string) is the description string of the charset."
          cyrillic-iso8859-5
          greek-iso8859-7
          thai-tis620
-         chinese-big5-cdp
          japanese-jisx0208
          japanese-jisx0208-1990
          japanese-jisx0212
-         korean-ksc5601
+         ucs-sip
          japanese-jisx0213-1
          japanese-jisx0213-2
          japanese-jisx0208-1978
@@ -288,12 +287,12 @@ DESCRIPTION (string) is the description string of the charset."
          chinese-cns11643-1
          chinese-cns11643-2
          chinese-cns11643-3
-         chinese-cns11643-4
+          chinese-cns11643-4
          chinese-cns11643-5
          chinese-cns11643-6
          chinese-cns11643-7
-         chinese-big5
-         chinese-gb12345
+         korean-ksc5601
+         ;; chinese-gb12345
          chinese-isoir165
          katakana-jisx0201
          hebrew-iso8859-8
@@ -304,7 +303,9 @@ DESCRIPTION (string) is the description string of the charset."
          lao
          ethiopic-ucs
          ethiopic
-         ideograph-daikanwa
+         arabic-digit
+         arabic-1-column
+         arabic-2-column
          ideograph-gt-pj-1
          ideograph-gt-pj-2
          ideograph-gt-pj-3
@@ -316,6 +317,14 @@ DESCRIPTION (string) is the description string of the charset."
          ideograph-gt-pj-9
          ideograph-gt-pj-10
          ideograph-gt-pj-11
+         ideograph-daikanwa-2
+         ideograph-daikanwa
+         chinese-big5-cdp
+         chinese-big5-eten-a
+         chinese-big5-eten-b
+         chinese-big5
+         ideograph-cbeta
+         ucs-bmp
          ideograph-hanziku-1
          ideograph-hanziku-2
          ideograph-hanziku-3
@@ -328,35 +337,9 @@ DESCRIPTION (string) is the description string of the charset."
          ideograph-hanziku-10
          ideograph-hanziku-11
          ideograph-hanziku-12
-         arabic-digit
-         arabic-1-column
-         arabic-2-column
-         mojikyo
          china3-jef
-         ideograph-cbeta
-;;;      mojikyo-pj-1
-;;;      mojikyo-pj-2
-;;;      mojikyo-pj-3
-;;;      mojikyo-pj-4
-;;;      mojikyo-pj-5
-;;;      mojikyo-pj-6
-;;;      mojikyo-pj-7
-;;;      mojikyo-pj-8
-;;;      mojikyo-pj-9
-;;;      mojikyo-pj-10
-;;;      mojikyo-pj-11
-;;;      mojikyo-pj-12
-;;;      mojikyo-pj-13
-;;;      mojikyo-pj-14
-;;;      mojikyo-pj-15
-;;;      mojikyo-pj-16
-;;;      mojikyo-pj-17
-;;;      mojikyo-pj-18
-;;;      mojikyo-pj-19
-;;;      mojikyo-pj-20
-;;;      mojikyo-pj-21
-         ucs-bmp
-         mojikyo-2022-1
-         arabic-iso8859-6)))
+         arabic-iso8859-6
+         chinese-big5-1
+         chinese-big5-2)))
 
 ;;; mule-charset.el ends here