Commit 40033db7 authored by Kenichi Handa's avatar Kenichi Handa

(char_table_ascii): Check if the char table contents

is sub-char-table or not.
(char_table_set): Fix argument to char_table_ascii.
(char_table_set_range): Likewise.
parent 5a843785
......@@ -114,7 +114,11 @@ char_table_ascii (table)
Lisp_Object sub;
sub = XCHAR_TABLE (table)->contents[0];
if (! SUB_CHAR_TABLE_P (sub))
return sub;
sub = XSUB_CHAR_TABLE (sub)->contents[0];
if (! SUB_CHAR_TABLE_P (sub))
return sub;
return XSUB_CHAR_TABLE (sub)->contents[0];
}
......@@ -415,7 +419,7 @@ char_table_set (table, c, val)
}
sub_char_table_set (sub, c, val);
if (ASCII_CHAR_P (c))
tbl->ascii = char_table_ascii (tbl);
tbl->ascii = char_table_ascii (table);
}
return val;
}
......@@ -472,7 +476,7 @@ char_table_set_range (table, from, to, val)
i++, min_char += chartab_chars[0])
sub_char_table_set_range (contents + i, 0, min_char, from, to, val);
if (ASCII_CHAR_P (from))
tbl->ascii = char_table_ascii (tbl);
tbl->ascii = char_table_ascii (table);
}
return val;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment