Sync with r21-2-19-utf-2000-0_5-1.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4e9dc87..599d41d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+1999-09-02  MORIOKA Tomohiko  <tomo@etl.go.jp>
+
+       * chartab.h (CHAR_TABLE_NON_ASCII_VALUE_UNSAFE): Use `Charset_ID'
+       instead of `int'.
+
+       * mule-charset.h, buffer.h (Charset_ID): New type.
+
 1999-09-01  MORIOKA Tomohiko  <tomo@etl.go.jp>
 
        * mule-canna.c (c2mu): Use `MAKE_CHAR',

diff --git a/src/chartab.h b/src/chartab.h
index 535648a..8ed1cf4 100644 (file)
--- a/src/chartab.h
+++ b/src/chartab.h
@@ -140,7 +140,7 @@ CHAR_TABLE_NON_ASCII_VALUE_UNSAFE (Lisp_Char_Table *ct, Emchar ch);
 INLINE_HEADER Lisp_Object
 CHAR_TABLE_NON_ASCII_VALUE_UNSAFE (Lisp_Char_Table *ct, Emchar ch)
 {
-  int lb = CHAR_LEADING_BYTE (ch);
+  Charset_ID lb = CHAR_LEADING_BYTE (ch);
   if (!CHAR_TABLE_ENTRYP ((ct)->level1[lb - MIN_LEADING_BYTE]))
     return (ct)->level1[lb - MIN_LEADING_BYTE];
   else