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

(calc_line_height_property): Use string position when

Browse source 
object is a string.
This commit is contained in:
Kim F. Storm 2004-05-10 11:16:37 +00:00
parent e2c02c1a1d
commit 7e1704d0a9
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/xdisp.c
View file

@ -18529,12 +18529,16 @@ calc_line_height_property (it, prop, font, boff, total)
XFontStruct *font;
int boff, *total;
{
Lisp_Object val;
Lisp_Object position, val;
Lisp_Object face_name = Qnil;
int ascent, descent, height, override;
val = Fget_char_property (make_number (IT_CHARPOS (*it)),
prop, it->object);
if (STRINGP (it->object))
position = make_number (IT_STRING_CHARPOS (*it));
else
position = make_number (IT_CHARPOS (*it));
val = Fget_char_property (position, prop, it->object);
if (NILP (val))
return val;