procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(font_find_for_lface): Fix previous change. Be sure to

Browse source 
close a font-object.
(Ffont_shape_text): If FONT_OBJECT is not a font-object, just
return TO.
This commit is contained in:
Kenichi Handa 2008-01-28 23:59:56 +00:00
parent 0b8b3c1cdf
commit d9e11902b2
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/font.c
View file

@ -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));