Mercurial > emacs
changeset 107986:8a09d4206862
charset.c (char_charset): Consider Vcharset_non_preferred_head only when the arg CHARSET_LIST is nil.
| author | Kenichi Handa <handa@etlken> |
|---|---|
| date | Tue, 20 Apr 2010 15:30:26 +0900 |
| parents | 9a1538888aae |
| children | 54f7ec0a9243 |
| files | src/ChangeLog src/charset.c |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Apr 20 13:24:33 2010 +0900 +++ b/src/ChangeLog Tue Apr 20 15:30:26 2010 +0900 @@ -1,3 +1,8 @@ +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
--- a/src/charset.c Tue Apr 20 13:24:33 2010 +0900 +++ b/src/charset.c Tue Apr 20 15:30:26 2010 +0900 @@ -2082,8 +2082,9 @@ 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