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

diff --git a/src/ChangeLog b/src/ChangeLog
index 17915b318ff844676f935e0443f59a9ab2b8b813..856cc1aec64c125cab031615868e79bdf15afa4d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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

diff --git a/src/charset.c b/src/charset.c
index 125c91316871c569c135729744bb126641073d80..18c0bbb6310201aa97d7b531513a4a23977abd59 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -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