[Emacs-diffs] /srv/bzr/emacs/trunk r99948: charset.c (char_charset): Consider Vcharset_non_preferred_head only when the arg CHARSET_LIST is nil.

[Kenichi Handa]

------------------------------------------------------------
revno: 99948 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: trunk
timestamp: Tue 2010-04-20 16:27:15 +0900
message:
  charset.c (char_charset): Consider Vcharset_non_preferred_head only when the 
arg CHARSET_LIST is nil.
modified:
  src/ChangeLog
  src/charset.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-20 01:50:52 +0000
+++ b/src/ChangeLog     2010-04-20 07:26:02 +0000
@@ -1,3 +1,8 @@
+2010-04-20  Kenichi Handa  <address@hidden>
+
+       * charset.c (char_charset): Consider Vcharset_non_preferred_head
+       only when the arg CHARSET_LIST is nil.
+
 2010-04-20  Stefan Monnier  <address@hidden>
 
        Make variable forwarding explicit rather the using special values.
@@ -110,6 +115,8 @@
 
        * .gdbinit (xsubchartable): New command.
 
+2010-04-19  Eli Zaretskii  <address@hidden>
+
        * xdisp.c (display_line): Don't write beyond the last glyph row in
        the desired matrix.  Fixes a crash in "emacs -nw" (bug#5972), see
        http://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00075.html

=== modified file 'src/charset.c'
--- a/src/charset.c     2010-02-28 14:19:31 +0000
+++ b/src/charset.c     2010-04-20 06:30:26 +0000
@@ -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