X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmule%2Fmule-charset.el;h=389b12a177d80b3074146f246a48aac9a53fb7ea;hb=c9ac5b541812f76d9164b6297f9a219e67dfc6a3;hp=c056eb4328c2f43815f0708684c68a9972b2a92e;hpb=4d6573165713a2ec65a6623a583552a3720732a9;p=chise%2Fxemacs-chise.git

diff --git a/lisp/mule/mule-charset.el b/lisp/mule/mule-charset.el
index c056eb4..389b12a 100644
--- a/lisp/mule/mule-charset.el
+++ b/lisp/mule/mule-charset.el
@@ -3,8 +3,7 @@
 ;; Copyright (C) 1992 Free Software Foundation, Inc.
 ;; Copyright (C) 1995 Amdahl Corporation.
 ;; Copyright (C) 1996 Sun Microsystems.
-;; Copyright (C) 1999 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
+;; Copyright (C) 1999,2000,2001 MORIOKA Tomohiko
 
 ;; Author: Unknown
 ;; Keywords: i18n, mule, internal
@@ -251,6 +250,15 @@ DESCRIPTION (string) is the description string of the charset."
 (defalias 'charset-plist 'object-plist)
 (defalias 'set-charset-plist 'setplist)
 
+;; 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))))
+
 
 ;;; @ Coded character set
 ;;;
@@ -258,7 +266,6 @@ DESCRIPTION (string) is the description string of the charset."
 (when (featurep 'utf-2000)
   (setq default-coded-charset-priority-list
 	'(ascii
-          ;; latin-iso646-irv
 	  control-1
 	  latin-iso8859-1
 	  latin-iso8859-2
@@ -269,19 +276,30 @@ DESCRIPTION (string) is the description string of the charset."
 	  cyrillic-iso8859-5
 	  greek-iso8859-7
 	  thai-tis620
-          ;; hiragana-jisx0208
-          ;; katakana-jisx0208
 	  japanese-jisx0208
+	  japanese-jisx0208-1990
 	  japanese-jisx0212
+	  ucs-sip
+	  japanese-jisx0213-1
+	  japanese-jisx0213-2
+	  japanese-jisx0208-1978
+	  chinese-gb2312
 	  chinese-cns11643-1
 	  chinese-cns11643-2
 	  chinese-cns11643-3
-	  chinese-cns11643-4
+          chinese-cns11643-4
 	  chinese-cns11643-5
 	  chinese-cns11643-6
 	  chinese-cns11643-7
 	  korean-ksc5601
-	  chinese-gb2312
+	  ideograph-daikanwa-2
+	  ideograph-daikanwa
+	  china3-jef
+	  ideograph-cbeta
+	  chinese-big5-cdp
+	  ;; chinese-gb12345
+	  chinese-isoir165
+	  katakana-jisx0201
 	  hebrew-iso8859-8
 	  latin-viscii
 	  latin-viscii-lower
@@ -290,6 +308,33 @@ DESCRIPTION (string) is the description string of the charset."
 	  lao
 	  ethiopic-ucs
 	  ethiopic
+	  ideograph-hanziku-1
+	  ideograph-hanziku-2
+	  ideograph-hanziku-3
+	  ideograph-hanziku-4
+	  ideograph-hanziku-5
+	  ideograph-hanziku-6
+	  ideograph-hanziku-7
+	  ideograph-hanziku-8
+	  ideograph-hanziku-9
+	  ideograph-hanziku-10
+	  ideograph-hanziku-11
+	  ideograph-hanziku-12
+	  arabic-digit
+	  arabic-1-column
+	  arabic-2-column
+	  ideograph-gt-pj-1
+	  ideograph-gt-pj-2
+	  ideograph-gt-pj-3
+	  ideograph-gt-pj-4
+	  ideograph-gt-pj-5
+	  ideograph-gt-pj-6
+	  ideograph-gt-pj-7
+	  ideograph-gt-pj-8
+	  ideograph-gt-pj-9
+	  ideograph-gt-pj-10
+	  ideograph-gt-pj-11
+	  chinese-big5
 	  ucs-bmp
 	  arabic-iso8859-6)))