From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sun, 25 Nov 2001 23:07:38 +0000 (+0000)
Subject: (merge_face_heights): Coerce back to int explicitly.
X-Git-Tag: ttn-vms-21-2-B4~18168
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c319cf2458b71e204549ebf0327c399105ab44c1;p=emacs.git

(merge_face_heights): Coerce back to int explicitly.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index 8e4472964af..f1477fdea4c 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3240,7 +3240,7 @@ merge_face_heights (from, to, invalid, gcpro)
     {
       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));