Commit c0be27fd authored by Kenichi Handa's avatar Kenichi Handa

charset.c (char_charset): Consider Vcharset_non_preferred_head only when the...

charset.c (char_charset): Consider Vcharset_non_preferred_head only when the arg CHARSET_LIST is nil.
parent 37dcfea0
2010-04-20 Kenichi Handa <handa@m17n.org>
* charset.c (char_charset): Consider Vcharset_non_preferred_head
only when the arg CHARSET_LIST is nil.
2010-04-19 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (display_line): Don't write beyond the last glyph row in
......
......@@ -2082,8 +2082,9 @@ char_charset (c, charset_list, code_return)
return charset;
}
charset_list = XCDR (charset_list);
if (c <= MAX_UNICODE_CHAR
&& EQ (charset_list, Vcharset_non_preferred_head))
if (! maybe_null
&& c <= MAX_UNICODE_CHAR
&& EQ (charset_list, Vcharset_non_preferred_head))
return CHARSET_FROM_ID (charset_unicode);
}
return (maybe_null ? NULL
......
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