From: tomo <tomo>
Date: Mon, 11 Oct 1999 21:43:44 +0000 (+0000)
Subject: (CHAR_TABLE_NON_ASCII_VALUE_UNSAFE): Use `CHAR_CHARSET_ID' instead of
X-Git-Tag: r21-2-19-utf-2000-0_9-0~5
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=9f2670624787114905392a51571c4d3bc1e5856b;p=chise%2Fxemacs-chise.git.1

(CHAR_TABLE_NON_ASCII_VALUE_UNSAFE): Use `CHAR_CHARSET_ID' instead of
`CHAR_LEADING_BYTE' in UTF-2000.
---

diff --git a/src/chartab.h b/src/chartab.h
index 5191099..dc4301a 100644
--- a/src/chartab.h
+++ b/src/chartab.h
@@ -141,7 +141,11 @@ CHAR_TABLE_NON_ASCII_VALUE_UNSAFE (struct Lisp_Char_Table *ct, Emchar ch);
 INLINE Lisp_Object
 CHAR_TABLE_NON_ASCII_VALUE_UNSAFE (struct Lisp_Char_Table *ct, Emchar ch)
 {
+#ifdef UTF2000
+  Charset_ID lb = CHAR_CHARSET_ID (ch);
+#else
   Charset_ID lb = CHAR_LEADING_BYTE (ch);
+#endif
   if (!CHAR_TABLE_ENTRYP ((ct)->level1[lb - MIN_LEADING_BYTE]))
     return (ct)->level1[lb - MIN_LEADING_BYTE];
   else