mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-30 19:53:09 +00:00
Code Issues Releases Activity

(calc_line_height_property): YAILOM (yet another int/Lisp_Object mixup).

Browse Source
This commit is contained in:
Stefan Monnier 2004-05-01 21:19:31 +00:00
parent ee99b45b27
commit d9bf7950c2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2004-05-01 Stefan Monnier <monnier@iro.umontreal.ca>
* xdisp.c (calc_line_height_property): YAILOM (yet another
int/Lisp_Object mixup).
2004-05-01 Eli Zaretskii <eliz@gnu.org> 2004-05-01 Eli Zaretskii <eliz@gnu.org>
* msdos.c (top-level): Add "#pragma pack(0)" after <dir.h>, to * msdos.c (top-level): Add "#pragma pack(0)" after <dir.h>, to

4
src/xdisp.c
View File

@ -18572,12 +18572,12 @@ calc_line_height_property (it, prop, font, boff)
face_id = lookup_named_face (it->f, face_name, ' '); face_id = lookup_named_face (it->f, face_name, ' ');
if (face_id < 0) if (face_id < 0)
return -1; return make_number (-1);
face = FACE_FROM_ID (it->f, face_id); face = FACE_FROM_ID (it->f, face_id);
font = face->font; font = face->font;
if (font == NULL) if (font == NULL)
return -1; return make_number (-1);
font_info = FONT_INFO_FROM_ID (it->f, face->font_info_id); font_info = FONT_INFO_FROM_ID (it->f, face->font_info_id);
boff = font_info->baseline_offset; boff = font_info->baseline_offset;