From 80655fdb77226d96a8c92f532efd3edf0bfaceb3 Mon Sep 17 00:00:00 2001
From: tomo <tomo>
Date: Mon, 7 Jun 2004 16:54:27 +0000
Subject: [PATCH] Sync up with r21-4-14-chise-0_21-28-fix2.

---
 lisp/utf-2000/ChangeLog              |    4 ++++
 lisp/utf-2000/Ideograph-R116-Cave.el |   11 +++++++++--
 src/ChangeLog                        |    7 +++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index 4aeb58c..d424d68 100644
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-06  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* Ideograph-R116-Cave.el (C2-315E): Delete `=>ucs'.
+
 2004-06-01  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
 	* Ideograph-R120-Silk.el:
diff --git a/lisp/utf-2000/Ideograph-R116-Cave.el b/lisp/utf-2000/Ideograph-R116-Cave.el
index a8bfa70..c0ff50e 100644
--- a/lisp/utf-2000/Ideograph-R116-Cave.el
+++ b/lisp/utf-2000/Ideograph-R116-Cave.el
@@ -732,8 +732,6 @@
       (=jef-china3	  . #x5DCF)	; &I-JC3-5DCF;
       (=ucs@jis		  . #x7A8A)	; &JX2-732E;
       )
-     ((mojikyo		  . 025467)	; &MCS-6000637B;
-      )
      ((=cns11643-2	  . #x315E)	; &C2-315E;
       ))
     ))
@@ -741,6 +739,15 @@
   '((ideographic-radical . 116)	; â½³
     (ideographic-strokes . 5)
     (total-strokes	 . 10)
+    (<-denotational
+     ((=cns11643-2	  . #x315E)	; &C2-315E;
+      ))
+    (mojikyo		. 025467)	; &MCS-6000637B;
+    ))
+(define-char
+  '((ideographic-radical . 116)	; â½³
+    (ideographic-strokes . 5)
+    (total-strokes	 . 10)
     (=ucs		. #x7A8B)	; 窋
     (=big5		. #xD2F9)	; &I-B-D2F9;
     (->subsumptive
diff --git a/src/ChangeLog b/src/ChangeLog
index 384416d..d34843f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-04  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* mule-charset.c (Qsystem_char_id): New variable.
+
+	* chartab.c (Qsystem_char_id): Deleted even if HAVE_CHISE is
+	defined and HAVE_LIBCHISE_LIBCHISE is not defined.
+
 2004-05-14  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
 	* chartab.c (Fput_char_attribute): When processing a reference of
-- 
1.7.10.4