From: tomo <tomo>
Date: Mon, 30 Aug 1999 14:09:06 +0000 (+0000)
Subject: (chinese-cns11643-3): Don't define if `utf-2000' is provided because
X-Git-Tag: r21-2-19-utf-2000-0_4-3~8
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=39b2584f3c0a89cd400a373d33df94c8efa75e4e;p=chise%2Fxemacs-chise.git.1

(chinese-cns11643-3): Don't define if `utf-2000' is provided because
it is defined as builtin charset.
(chinese-cns11643-4): Likewise.
(chinese-cns11643-5): Likewise.
(chinese-cns11643-6): Likewise.
(chinese-cns11643-7): Likewise.
---

diff --git a/lisp/mule/chinese.el b/lisp/mule/chinese.el
index aff138f..c9e17e0 100644
--- a/lisp/mule/chinese.el
+++ b/lisp/mule/chinese.el
@@ -50,26 +50,27 @@
 ;; that appear once in some ancient manuscript and whose meaning
 ;; is unknown.
 
-(flet
-    ((make-chinese-cns11643-charset
-      (name plane final)
-      (make-charset
-       name (concat "CNS 11643 Plane " plane " (Chinese traditional)")
-       `(registry 
-         ,(concat "CNS11643[.-]\\(.*[.-]\\)?" plane "$")
-         dimension 2
-         chars 94
-         final ,final
-         graphic 0))
-      (modify-syntax-entry   name "w")
-      (modify-category-entry name ?t)
-      ))
-  (make-chinese-cns11643-charset 'chinese-cns11643-3 "3" ?I)
-  (make-chinese-cns11643-charset 'chinese-cns11643-4 "4" ?J)
-  (make-chinese-cns11643-charset 'chinese-cns11643-5 "5" ?K)
-  (make-chinese-cns11643-charset 'chinese-cns11643-6 "6" ?L)
-  (make-chinese-cns11643-charset 'chinese-cns11643-7 "7" ?M)
-  )
+(unless (featurep 'utf-2000)
+  (flet
+   ((make-chinese-cns11643-charset
+     (name plane final)
+     (make-charset
+      name (concat "CNS 11643 Plane " plane " (Chinese traditional)")
+      `(registry 
+	,(concat "CNS11643[.-]\\(.*[.-]\\)?" plane "$")
+	dimension 2
+	chars 94
+	final ,final
+	graphic 0))
+     (modify-syntax-entry   name "w")
+     (modify-category-entry name ?t)
+     ))
+   (make-chinese-cns11643-charset 'chinese-cns11643-3 "3" ?I)
+   (make-chinese-cns11643-charset 'chinese-cns11643-4 "4" ?J)
+   (make-chinese-cns11643-charset 'chinese-cns11643-5 "5" ?K)
+   (make-chinese-cns11643-charset 'chinese-cns11643-6 "6" ?L)
+   (make-chinese-cns11643-charset 'chinese-cns11643-7 "7" ?M)
+   ))
 
 ;; ISO-IR-165 (CCITT Extended GB)
 ;;    It is based on CCITT Recommendation T.101, includes GB 2312-80 +