(insert-char-data): Fix format of `iso-10646-comment'; swap order of

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

diff --git a/src/chartab.c b/src/chartab.c
index f5ee443..003c919 100644 (file)
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -819,7 +819,7 @@ get_char_table (Emchar ch, struct Lisp_Char_Table *ct)
       val = ct->ascii[byte1 + 128];
     else
       {
-       Charset_ID lb = XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE;
+       int lb = XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE;
        val = ct->level1[lb];
        if (CHAR_TABLE_ENTRYP (val))
          {
@@ -1074,8 +1074,7 @@ put_char_table (struct Lisp_Char_Table *ct, struct chartab_range *range,
        }
       else
        {
-         Charset_ID lb
-           = XCHARSET_LEADING_BYTE (range->charset) - MIN_LEADING_BYTE;
+         int lb = XCHARSET_LEADING_BYTE (range->charset) - MIN_LEADING_BYTE;
          ct->level1[lb] = val;
        }
       break;
@@ -1083,8 +1082,7 @@ put_char_table (struct Lisp_Char_Table *ct, struct chartab_range *range,
     case CHARTAB_RANGE_ROW:
       {
        struct Lisp_Char_Table_Entry *cte;
-       Charset_ID lb
-         = XCHARSET_LEADING_BYTE (range->charset) - MIN_LEADING_BYTE;
+       int lb = XCHARSET_LEADING_BYTE (range->charset) - MIN_LEADING_BYTE;
        /* make sure that there is a separate entry for the row. */
        if (!CHAR_TABLE_ENTRYP (ct->level1[lb]))
          ct->level1[lb] = make_char_table_entry (ct->level1[lb]);
@@ -1108,7 +1106,7 @@ put_char_table (struct Lisp_Char_Table *ct, struct chartab_range *range,
        else
          {
            struct Lisp_Char_Table_Entry *cte;
-           Charset_ID lb = XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE;
+           int lb = XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE;
            /* make sure that there is a separate entry for the row. */
            if (!CHAR_TABLE_ENTRYP (ct->level1[lb]))
              ct->level1[lb] = make_char_table_entry (ct->level1[lb]);