Sync with r21-4-9-utf-2000-0_19-mcsi2.

diff --git a/src/ChangeLog b/src/ChangeLog
index beb3d70..ddac356 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-20  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * mule-charset.c (charset_code_point): if a coded-charset has a
+       final-byte, don't inherit the builtin range of the mother CCS.
+
 2002-11-15  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
        * mule-charset.c (charset_code_point): Fix problem about

diff --git a/src/mule-charset.c b/src/mule-charset.c
index 8d7452f..0df3c14 100644 (file)
--- a/src/mule-charset.c
+++ b/src/mule-charset.c
@@ -1065,7 +1065,12 @@ charset_code_point (Lisp_Object charset, Emchar ch, int defined_only)
       int code = -1;
 
       if ( CHARSETP (mother) )
-       code = charset_code_point (mother, ch, defined_only);
+       {
+         if (XCHARSET_FINAL (charset) >= '0')
+           code = charset_code_point (mother, ch, 1);
+         else
+           code = charset_code_point (mother, ch, defined_only);
+       }
       else if (defined_only)
        return -1;
       else if ( ((max == 0) && CHARSETP (mother)