update.

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

diff --git a/src/chartab.c b/src/chartab.c
index 4ff2a57..6e12d84 100644 (file)
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -2143,7 +2143,7 @@ put_char_table (Lisp_Char_Table *ct, struct chartab_range *range,
          {
            for (c = 0; c < 1 << 24; c++)
              {
-               if ( charset_code_point (range->charset, c) >= 0 )
+               if ( charset_code_point (range->charset, c, 0) >= 0 )
                  put_char_id_table_0 (ct, c, val);
              }
          }
@@ -2181,7 +2181,7 @@ put_char_table (Lisp_Char_Table *ct, struct chartab_range *range,
          {
            Emchar ch = DECODE_CHAR (range->charset, (range->row << 8) | i);
 
-           if ( charset_code_point (range->charset, ch) >= 0 )
+           if ( charset_code_point (range->charset, ch, 0) >= 0 )
              put_char_id_table_0 (ct, ch, val);
          }
       }
@@ -2611,7 +2611,7 @@ map_char_table (Lisp_Char_Table *ct,
          {
            Emchar ch = DECODE_CHAR (range->charset, (range->row << 8) | i);
 
-           if ( charset_code_point (range->charset, ch) >= 0 )
+           if ( charset_code_point (range->charset, ch, 0) >= 0 )
              {
                Lisp_Object val
                  = get_byte_table (get_byte_table
@@ -3100,7 +3100,8 @@ Store character's ATTRIBUTES.
            signal_simple_error ("Invalid argument", attributes);
          if (!NILP (ccs = Ffind_charset (Fcar (cell)))
              && ((XCHARSET_FINAL (ccs) != 0) ||
-                 (XCHARSET_UCS_MAX (ccs) > 0)) )
+                 (XCHARSET_MAX_CODE (ccs) > 0) ||
+                 (EQ (ccs, Vcharset_chinese_big5))) )
            {
              cell = Fcdr (cell);
              if (CONSP (cell))
@@ -3327,7 +3328,7 @@ check_category_table (Lisp_Object object, Lisp_Object default_)
 
 int
 check_category_char (Emchar ch, Lisp_Object table,
-                    unsigned int designator, unsigned int not)
+                    unsigned int designator, unsigned int not_p)
 {
   REGISTER Lisp_Object temp;
   Lisp_Char_Table *ctbl;
@@ -3338,10 +3339,10 @@ check_category_char (Emchar ch, Lisp_Object table,
   ctbl = XCHAR_TABLE (table);
   temp = get_char_table (ch, ctbl);
   if (NILP (temp))
-    return not;
+    return not_p;
 
   designator -= ' ';
-  return bit_vector_bit (XBIT_VECTOR (temp), designator) ? !not : not;
+  return bit_vector_bit (XBIT_VECTOR (temp), designator) ? !not_p : not_p;
 }
 
 DEFUN ("check-category-at", Fcheck_category_at, 2, 4, 0, /*