From d9bf7950c2d6f823a9f9b16c8bbc723d0b9c768e Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sat, 1 May 2004 21:19:31 +0000 Subject: [PATCH] (calc_line_height_property): YAILOM (yet another int/Lisp_Object mixup). --- src/ChangeLog | 5 +++++ src/xdisp.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index e859945b3f7..4e019bf5280 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2004-05-01 Stefan Monnier + + * xdisp.c (calc_line_height_property): YAILOM (yet another + int/Lisp_Object mixup). + 2004-05-01 Eli Zaretskii * msdos.c (top-level): Add "#pragma pack(0)" after , to diff --git a/src/xdisp.c b/src/xdisp.c index 2ae2a7333ee..8ccd08ebae7 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -18572,12 +18572,12 @@ calc_line_height_property (it, prop, font, boff) 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; -- 2.39.5