# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1228282214 0
# Node ID acef56f002fc212fac21b419756b9d1333d44a22
# Parent  b80052504b85681a7ad0c2dad539610195915445
(face_for_char): Handle invalid charset property
correctly.
(font_for_char): Likewise.

diff -r b80052504b85 -r acef56f002fc src/fontset.c
--- a/src/fontset.c	Wed Dec 03 05:16:38 2008 +0000
+++ b/src/fontset.c	Wed Dec 03 05:30:14 2008 +0000
@@ -894,9 +894,7 @@
   else
     {
       charset = Fget_char_property (make_number (pos), Qcharset, object);
-      if (NILP (charset))
-	id = -1;
-      else if (CHARSETP (charset))
+      if (CHARSETP (charset))
 	{
 	  Lisp_Object val;
 
@@ -905,6 +903,8 @@
 	    charset = XCDR (val);
 	  id = XINT (CHARSET_SYMBOL_ID (charset));
 	}
+      else
+	id = -1;
     }
 
   font_deferred_log ("font for", Fcons (make_number (c), charset), Qnil);
@@ -966,9 +966,7 @@
   else
     {
       charset = Fget_char_property (make_number (pos), Qcharset, object);
-      if (NILP (charset))
-	id = -1;
-      else if (CHARSETP (charset))
+      if (CHARSETP (charset))
 	{
 	  Lisp_Object val;
 
@@ -977,6 +975,8 @@
 	    charset = XCDR (val);
 	  id = XINT (CHARSET_SYMBOL_ID (charset));
 	}
+      else
+	id = -1;
     }
 
   font_deferred_log ("font for", Fcons (make_number (c), charset), Qnil);