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

(font_find_for_lface): Fix previous change. Be sure to

close a font-object.
(Ffont_shape_text): If FONT_OBJECT is not a font-object, just
return TO.
parent 0b8b3c1c
......@@ -2703,6 +2703,7 @@ font_find_for_lface (f, lface, spec, c)
if (NILP (val))
return Qnil;
result = font_has_char (f, val, c);
font_close_object (f, val);
if (result > 0)
return val;
return Qnil;
......@@ -3566,6 +3567,9 @@ FONT-OBJECT. */)
args_out_of_range_3 (string, from, to);
if (! FONT_OBJECT_P (font_object))
return to;
CHECK_FONT_GET_OBJECT (font_object, font);
len = end - start;
gstring = Ffont_make_gstring (font_object, make_number (len));
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