Mercurial > emacs
changeset 55301:c2bea9cc10a3
(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 | 2db456741f80 |
| children | 56bb135eddf9 |
| files | src/ChangeLog src/xdisp.c |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat May 01 21:16:07 2004 +0000 +++ b/src/ChangeLog Sat May 01 21:19:31 2004 +0000 @@ -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> * msdos.c (top-level): Add "#pragma pack(0)" after <dir.h>, to
--- a/src/xdisp.c Sat May 01 21:16:07 2004 +0000 +++ b/src/xdisp.c Sat May 01 21:19:31 2004 +0000 @@ -18572,12 +18572,12 @@ face_id = lookup_named_face (it->f, face_name, ' '); if (face_id < 0) - return -1; + return make_number (-1); face = FACE_FROM_ID (it->f, face_id); font = face->font; if (font == NULL) - return -1; + return make_number (-1); font_info = FONT_INFO_FROM_ID (it->f, face->font_info_id); boff = font_info->baseline_offset;