(charset_code_point): Use `CHAR_TABLEP' instead of `CHAR_ID_TABLE_P'.

(encode_char_1): Likewise.

diff --git a/src/char-ucs.h b/src/char-ucs.h
index 084a211..e3c6763 100644 (file)
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -586,7 +586,7 @@ charset_code_point (Lisp_Object charset, Emchar ch)
   Lisp_Object encoding_table = XCHARSET_ENCODING_TABLE (charset);
   Lisp_Object ret;
 
-  if ( CHAR_ID_TABLE_P (encoding_table)
+  if ( CHAR_TABLEP (encoding_table)
        && INTP (ret = get_char_id_table (XCHAR_TABLE(encoding_table),
                                         ch)) )
     return XINT (ret);
@@ -611,7 +611,7 @@ encode_char_1 (Emchar ch, Lisp_Object* charset)
          Lisp_Object encoding_table = XCHARSET_ENCODING_TABLE (*charset);
          Lisp_Object ret;
 
-         if ( CHAR_ID_TABLE_P (encoding_table)
+         if ( CHAR_TABLEP (encoding_table)
               && INTP (ret
                        = get_char_id_table (XCHAR_TABLE(encoding_table),
                                             ch)) )