/[emacs]/emacs/src/xfaces.c
ViewVC logotype

Diff of /emacs/src/xfaces.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.245 by kfstorm, Fri Nov 16 13:09:54 2001 UTC revision 1.246 by monnier, Sun Nov 25 23:07:38 2001 UTC
# Line 3240  merge_face_heights (from, to, invalid, g Line 3240  merge_face_heights (from, to, invalid, g
3240      {      {
3241        if (INTEGERP (to))        if (INTEGERP (to))
3242          /* relative X absolute => absolute */          /* relative X absolute => absolute */
3243          result = make_number (XFLOAT_DATA (from) * XINT (to));          result = make_number ((EMACS_INT)(XFLOAT_DATA (from) * XINT (to)));
3244        else if (FLOATP (to))        else if (FLOATP (to))
3245          /* relative X relative => relative */          /* relative X relative => relative */
3246          result = make_float (XFLOAT_DATA (from) * XFLOAT_DATA (to));          result = make_float (XFLOAT_DATA (from) * XFLOAT_DATA (to));

Legend:
Removed from v.1.245  
changed lines
  Added in v.1.246

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26