Mercurial > emacs

comparison src/xdisp.c @ 55301:c2bea9cc10a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(calc_line_height_property): YAILOM (yet another int/Lisp_Object mixup).
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sat, 01 May 2004 21:19:31 +0000
parents c5bad07bbb95
children cec2c6c3bafb
comparison
equal deleted inserted replaced
55300:2db456741f80 55301:c2bea9cc10a3
18570 struct face *face; 18570 struct face *face;
18571 struct font_info *font_info; 18571 struct font_info *font_info;
18572 18572
18573 face_id = lookup_named_face (it->f, face_name, ' '); 18573 face_id = lookup_named_face (it->f, face_name, ' ');
18574 if (face_id < 0) 18574 if (face_id < 0)
18575 return -1; 18575 return make_number (-1);
18576 18576
18577 face = FACE_FROM_ID (it->f, face_id); 18577 face = FACE_FROM_ID (it->f, face_id);
18578 font = face->font; 18578 font = face->font;
18579 if (font == NULL) 18579 if (font == NULL)
18580 return -1; 18580 return make_number (-1);
18581 18581
18582 font_info = FONT_INFO_FROM_ID (it->f, face->font_info_id); 18582 font_info = FONT_INFO_FROM_ID (it->f, face->font_info_id);
18583 boff = font_info->baseline_offset; 18583 boff = font_info->baseline_offset;
18584 if (font_info->vertical_centering) 18584 if (font_info->vertical_centering)
18585 boff = VCENTER_BASELINE_OFFSET (font, it->f) - boff; 18585 boff = VCENTER_BASELINE_OFFSET (font, it->f) - boff;