From: tomo <tomo>
Date: Fri, 28 Mar 2003 01:21:43 +0000 (+0000)
Subject: Sync up with r21-4-11-chise-0_20-4.
X-Git-Tag: r21-2-44-utf-2000-m0_18-n0_20-4~1
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c137ddb50ece664f15f0656bd5caf92b23630dc;p=chise%2Fxemacs-chise.git-

Sync up with r21-4-11-chise-0_20-4.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 67bb175..db9728d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2003-03-27  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
+
+	* mule/mule-conf.el (=ucs@jis-2000): Renamed from `=ucs-jis-2000'.
+	(=ucs-jis-2000): Changed to an alias for `=ucs@jis-2000'.
+
+2003-03-26  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
+
+	* mule/mule-conf.el (=ucs@jis-1990): Renamed from `=ucs-jis-1990'.
+	(=ucs-jis-1990): Changed to an alias for `=ucs@jis-1990'.
+
 2003-03-24  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
 
 	* mule/mule-conf.el (=ucs@jis): Renamed from `ucs-jis'.
diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el
index 46429ab..576c043 100644
--- a/lisp/mule/mule-conf.el
+++ b/lisp/mule/mule-conf.el
@@ -171,7 +171,7 @@
 		  direction	l2r
 		  mother	=ucs))
   (define-charset-alias 'ucs-jis '=ucs@jis)
-  (make-charset '=ucs-jis-1990
+  (make-charset '=ucs@jis-1990
 		"UCS for JIS:1990"
 		`(long-name	"ISO/IEC 10646 for JIS X 0208/0212:1990"
 		  chars		256
@@ -180,7 +180,8 @@
 		  graphic	2
 		  direction	l2r
 		  mother	ucs-jis))
-  (make-charset '=ucs-jis-2000
+  (define-charset-alias '=ucs-jis-1990 '=ucs@jis-1990)
+  (make-charset '=ucs@jis-2000
 		"UCS for JIS:2000"
 		`(long-name	"ISO/IEC 10646 for JIS X 0213:2000"
 		  chars		256
@@ -189,6 +190,7 @@
 		  graphic	2
 		  direction	l2r
 		  mother	ucs-jis))
+  (define-charset-alias '=ucs-jis-2000 '=ucs@jis-2000)
   (make-charset 'ucs-ks
 		"UCS for KS"
 		`(long-name	"ISO/IEC 10646 for Korean Standards"
diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index c59a819..9163d0e 100644
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,3 +1,17 @@
+2003-03-27  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
+
+	* Ideograph-R085-Water.el (JX1-7654): Rename `=ucs-jis-2000' to
+	`=ucs@jis-2000'.
+	(JX1-7739): Likewise.
+
+	* Ideograph-R072-Sun.el (JX1-7540): Rename `=ucs-jis-2000' to
+	`=ucs@jis-2000'.
+
+2003-03-26  MORIOKA Tomohiko  <tomo@mousai.as.wakwak.ne.jp>
+
+	* Ideograph-R072-Sun.el (JSP-4247): Rename `=ucs-jis-1990' to
+	`=ucs@jis-1990'.
+
 2003-03-25  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
 	* Ideograph-R181-Leaf.el, Ideograph-R172-Short-Tailed-Bird.el,
diff --git a/lisp/utf-2000/Ideograph-R072-Sun.el b/lisp/utf-2000/Ideograph-R072-Sun.el
index e280637..e1dd0f9 100644
--- a/lisp/utf-2000/Ideograph-R072-Sun.el
+++ b/lisp/utf-2000/Ideograph-R072-Sun.el
@@ -3339,7 +3339,7 @@
     (korean-ksc5601	. #x4F7C)	; ø»‰Ÿ‹
     (japanese-jisx0212	. #x4247)	; ø»‹•”
     (ideograph-daikanwa . 14005)	; ø¸ƒšµ
-    (=ucs-jis-1990	. #x6677)	; ø»‰Ÿ‹
+    (=ucs@jis-1990	. #x6677)	; ø»‰Ÿ‹
     (ucs-ks		. #x6677)	; ø»‰Ÿ‹
     ))
 (define-char
@@ -3364,7 +3364,7 @@
     (chinese-big5	. #xB4BE)	; ý¢€‹’¾
     (=jef-china3	. #x51A7)	; øº…†§
     (=ucs@cns		. #x6677)	; ø»’ž¢
-    (=ucs-jis-2000	. #x6677)	; ø»’ž¢
+    (=ucs@jis-2000	. #x6677)	; ø»’ž¢
     (ucs-big5		. #x6677)	; ø»’ž¢
     (mojikyo		. 014005)	; ý €ƒšµ
     ))
diff --git a/lisp/utf-2000/Ideograph-R085-Water.el b/lisp/utf-2000/Ideograph-R085-Water.el
index 1ac158b..9b041e2 100644
--- a/lisp/utf-2000/Ideograph-R085-Water.el
+++ b/lisp/utf-2000/Ideograph-R085-Water.el
@@ -1064,7 +1064,7 @@
     (ideographic-strokes . 4)
     (total-strokes	 . 7)
     (=jis-x0213-1-2000	. #x7654)	; ø»¤¥
-    (=ucs-jis-2000	. #x6C74)	; ø»¤¥
+    (=ucs@jis-2000	. #x6C74)	; ø»¤¥
     (mojikyo		. 017165)	; ý €„Œ
     ))
 (define-char
@@ -21528,7 +21528,7 @@
     (ideographic-strokes . 15)
     (total-strokes	 . 18)
     (=jis-x0213-1-2000	. #x7739)	; ø»¤‘¨
-    (=ucs-jis-2000	. #x6FF9)	; ø»¤‘¨
+    (=ucs@jis-2000	. #x6FF9)	; ø»¤‘¨
     ))
 (define-char
   '((ideographic-radical . 85)	; ⽔