diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2001-11-25 23:07:38 +0000 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2001-11-25 23:07:38 +0000 |
commit | c695bed200a7b22e278da59054da0961a1a1dad0 (patch) | |
tree | e215809e12349a275fa6a2e3b13d61b83f48c2b4 /src/xfaces.c | |
parent | f684cdec6f2c3ca601d38ca67b81e13590b2e5e8 (diff) | |
download | emacs-c695bed200a7b22e278da59054da0961a1a1dad0.tar.gz |
(merge_face_heights): Coerce back to int explicitly.
Diffstat (limited to 'src/xfaces.c')
-rw-r--r-- | src/xfaces.c | 2 |
1 files changed, 1 insertions, 1 deletions
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)); |