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

diff --git a/src/ChangeLog b/src/ChangeLog
index e859945b3f709d6c37d1470189e5bf08570efce6..4e019bf52806bc49fe9a5ef45f1fe13bc422f7e4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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

diff --git a/src/xdisp.c b/src/xdisp.c
index 2ae2a7333ee9df416134147d46f432cf099e6291..8ccd08ebae7f46a8f24a8f78fa58bdd7da84ff22 100644 (file)
--- 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;