(put_char_id_table): Change interface.

[chise/xemacs-chise.git] / src / chartab.h

diff --git a/src/chartab.h b/src/chartab.h
index 73cfb19..8d745b7 100644 (file)
--- a/src/chartab.h
+++ b/src/chartab.h
@@ -27,6 +27,21 @@ Boston, MA 02111-1307, USA.  */
 #ifndef INCLUDED_chartab_h_
 #define INCLUDED_chartab_h_
 
+
+#ifdef UTF2000
+
+#include "char-ucs.h"
+
+Lisp_Object make_char_id_table (Lisp_Object initval);
+
+void put_char_id_table (Lisp_Char_ID_Table* table,
+                       Lisp_Object character, Lisp_Object value);
+
+EXFUN (Fget_char_attribute, 3);
+
+#endif
+
+
 /************************************************************************/
 /*                               Char Tables                            */
 /************************************************************************/
@@ -132,12 +147,12 @@ DECLARE_LRECORD (char_table, Lisp_Char_Table);
 #ifdef MULE
 
 Lisp_Object get_non_ascii_char_table_value (Lisp_Char_Table *ct,
-                                           int leading_byte,
+                                           Charset_ID leading_byte,
                                            Emchar c);
 
-INLINE Lisp_Object
+INLINE_HEADER Lisp_Object
 CHAR_TABLE_NON_ASCII_VALUE_UNSAFE (Lisp_Char_Table *ct, Emchar ch);
-INLINE Lisp_Object
+INLINE_HEADER Lisp_Object
 CHAR_TABLE_NON_ASCII_VALUE_UNSAFE (Lisp_Char_Table *ct, Emchar ch)
 {
 #ifdef UTF2000
@@ -162,6 +177,9 @@ CHAR_TABLE_NON_ASCII_VALUE_UNSAFE (Lisp_Char_Table *ct, Emchar ch)
 
 #endif /* not MULE */
 
+#define XCHAR_TABLE_VALUE_UNSAFE(ct, ch) \
+  CHAR_TABLE_VALUE_UNSAFE (XCHAR_TABLE (ct), ch)
+
 enum chartab_range_type
 {
   CHARTAB_RANGE_ALL,