# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1083446371 0
# Node ID c2bea9cc10a350b058325f44b3d21e84a9d32656
# Parent  2db456741f8020f69b5c2302c937709bb8e6f129
(calc_line_height_property): YAILOM (yet another int/Lisp_Object mixup).

diff -r 2db456741f80 -r c2bea9cc10a3 src/ChangeLog
--- 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
diff -r 2db456741f80 -r c2bea9cc10a3 src/xdisp.c
--- 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;