# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1006729658 0
# Node ID ee7c1fe5feafc5e1328fd6f36802bd4742792f83
# Parent  f0a204c61f816d79332a386bbe91c6e89d43c4ab
(merge_face_heights): Coerce back to int explicitly.

diff -r f0a204c61f81 -r ee7c1fe5feaf src/xfaces.c
--- a/src/xfaces.c	Sun Nov 25 22:37:00 2001 +0000
+++ b/src/xfaces.c	Sun Nov 25 23:07:38 2001 +0000
@@ -3240,7 +3240,7 @@
     {
       if (INTEGERP (to))
 	/* relative X absolute => absolute */
-	result = make_number (XFLOAT_DATA (from) * XINT (to));
+	result = make_number ((EMACS_INT)(XFLOAT_DATA (from) * XINT (to)));
       else if (FLOATP (to))
 	/* relative X relative => relative */
 	result = make_float (XFLOAT_DATA (from) * XFLOAT_DATA (to));