Commit b8ebe9dd authored by Kenichi Handa's avatar Kenichi Handa
Browse files

(Fdefine_charset_internal): After calculating

min_char, max_char, and fastmap, copy the charset structure again.
(encode_char): Fix the previous change.
parent 2644eb3f
2008-11-29 Kenichi Handa <handa@m17n.org>
* charset.c (Fdefine_charset_internal): After calculating
min_char, max_char, and fastmap, copy the charset structure again.
(encode_char): Fix the previous change.
2008-11-28 Seiji Zenitani <zenitani@mac.com>
* frame.c (x_set_alpha) [NS_IMPL_COCOA]: Call x_set_frame_alpha.
......
......@@ -1199,7 +1199,10 @@ usage: (define-charset-internal ...) */)
charset_table[id] = charset;
if (charset.method == CHARSET_METHOD_MAP)
load_charset (&charset, 0);
{
load_charset (&charset, 0);
charset_table[id] = charset;
}
if (charset.iso_final >= 0)
{
......@@ -1855,8 +1858,11 @@ encode_char (charset, c)
encoder = CHARSET_ENCODER (charset);
if (! CHAR_TABLE_P (CHARSET_ENCODER (charset)))
load_charset (charset);
if (CHAR_TABLE_P (CHARSET_ENCODER (charset)))
{
load_charset (charset, 2);
encoder = CHARSET_ENCODER (charset);
}
if (CHAR_TABLE_P (encoder))
{
val = CHAR_TABLE_REF (encoder, c);
if (NILP (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