From c609a628cc0f0096811d90ebc3bb2bbe9e04e8ad Mon Sep 17 00:00:00 2001 From: tomo Date: Wed, 20 Nov 2002 09:07:08 +0000 Subject: [PATCH] Sync with r21-4-9-utf-2000-0_19-mcsi2. --- src/ChangeLog | 5 +++++ src/mule-charset.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index beb3d70..ddac356 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2002-11-20 MORIOKA Tomohiko + + * 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 * 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 --- 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) -- 1.7.10.4