Commit b1bde622 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

(face_for_char): Handle invalid charset property

correctly.
(font_for_char): Likewise.
parent 2cf4d521
2008-12-03 Kenichi Handa <handa@m17n.org>
* fontset.c (face_for_char): Handle invalid charset property
correctly.
(font_for_char): Likewise.
2008-12-03 Chong Yidong <cyd@stupidchicken.com> 2008-12-03 Chong Yidong <cyd@stupidchicken.com>
   
* font.c (Fopen_font): Compute pixel size correctly. * font.c (Fopen_font): Compute pixel size correctly.
......
...@@ -894,9 +894,7 @@ face_for_char (f, face, c, pos, object) ...@@ -894,9 +894,7 @@ face_for_char (f, face, c, pos, object)
else else
{ {
charset = Fget_char_property (make_number (pos), Qcharset, object); charset = Fget_char_property (make_number (pos), Qcharset, object);
if (NILP (charset)) if (CHARSETP (charset))
id = -1;
else if (CHARSETP (charset))
{ {
Lisp_Object val; Lisp_Object val;
...@@ -905,6 +903,8 @@ face_for_char (f, face, c, pos, object) ...@@ -905,6 +903,8 @@ face_for_char (f, face, c, pos, object)
charset = XCDR (val); charset = XCDR (val);
id = XINT (CHARSET_SYMBOL_ID (charset)); id = XINT (CHARSET_SYMBOL_ID (charset));
} }
else
id = -1;
} }
font_deferred_log ("font for", Fcons (make_number (c), charset), Qnil); font_deferred_log ("font for", Fcons (make_number (c), charset), Qnil);
...@@ -966,9 +966,7 @@ font_for_char (face, c, pos, object) ...@@ -966,9 +966,7 @@ font_for_char (face, c, pos, object)
else else
{ {
charset = Fget_char_property (make_number (pos), Qcharset, object); charset = Fget_char_property (make_number (pos), Qcharset, object);
if (NILP (charset)) if (CHARSETP (charset))
id = -1;
else if (CHARSETP (charset))
{ {
Lisp_Object val; Lisp_Object val;
...@@ -977,6 +975,8 @@ font_for_char (face, c, pos, object) ...@@ -977,6 +975,8 @@ font_for_char (face, c, pos, object)
charset = XCDR (val); charset = XCDR (val);
id = XINT (CHARSET_SYMBOL_ID (charset)); id = XINT (CHARSET_SYMBOL_ID (charset));
} }
else
id = -1;
} }
font_deferred_log ("font for", Fcons (make_number (c), charset), Qnil); font_deferred_log ("font for", Fcons (make_number (c), charset), Qnil);
......
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