X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fchartab.h;h=e6d637b2ea964019dcab5617b903e99048654122;hb=49177a93dff4f349cb9c5474a32e0bc2720cf86b;hp=11d2a96a24f33ca3e82a5956b17834f0c1bc5925;hpb=3e59beca60decbc84d623834cae31ad3ae0c75fa;p=chise%2Fxemacs-chise.git diff --git a/src/chartab.h b/src/chartab.h index 11d2a96..e6d637b2 100644 --- a/src/chartab.h +++ b/src/chartab.h @@ -40,6 +40,8 @@ EXFUN (Fdecode_char, 3); EXFUN (Fput_char_attribute, 3); +EXFUN (Ffind_char, 1); + /************************************************************************/ /* Char-ID Tables */ @@ -355,18 +357,28 @@ char_attribute_system_db_file (Lisp_Object key_type, Lisp_Object attribute, Lisp_Object load_char_attribute_maybe (Lisp_Char_Table* cit, Emchar ch); #endif -INLINE_HEADER Lisp_Object get_char_id_table (Lisp_Char_Table* cit, Emchar ch); +INLINE_HEADER Lisp_Object +get_char_id_table_0 (Lisp_Char_Table* cit, Emchar ch); +INLINE_HEADER Lisp_Object +get_char_id_table_0 (Lisp_Char_Table* cit, Emchar ch) +{ + return get_byte_table (get_byte_table + (get_byte_table + (get_byte_table + (cit->table, + (unsigned char)(ch >> 24)), + (unsigned char) (ch >> 16)), + (unsigned char) (ch >> 8)), + (unsigned char) ch); +} + +INLINE_HEADER Lisp_Object +get_char_id_table (Lisp_Char_Table* cit, Emchar ch); INLINE_HEADER Lisp_Object get_char_id_table (Lisp_Char_Table* cit, Emchar ch) { - Lisp_Object val = get_byte_table (get_byte_table - (get_byte_table - (get_byte_table - (cit->table, - (unsigned char)(ch >> 24)), - (unsigned char) (ch >> 16)), - (unsigned char) (ch >> 8)), - (unsigned char) ch); + Lisp_Object val = get_char_id_table_0 (cit, ch); + #ifdef HAVE_DATABASE if (EQ (val, Qunloaded)) {