[Emacs-diffs] Changes to emacs/src/font.c,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/02/18 18:38:50

Index: font.c
===================================================================
RCS file: /sources/emacs/emacs/src/font.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- font.c      17 Feb 2008 02:03:58 -0000      1.6
+++ font.c      18 Feb 2008 18:38:49 -0000      1.7
@@ -75,7 +75,7 @@
 
 #define CHECK_VALIDATE_FONT_SPEC(x)                            \
   do {                                                         \
-    if (! FONT_SPEC_P (x)) x = wrong_type_argument (Qfont, x); \
+    if (! FONT_SPEC_P (x)) wrong_type_argument (Qfont, x);     \
     x = font_prop_validate (x);                                        \
   } while (0)
 
@@ -1161,18 +1161,21 @@
   xassert (NUMBERP (val) || NILP (val));
   if (INTEGERP (val))
     {
-      f[XLFD_PIXEL_INDEX] = alloca (22);
-      i = XINT (val);
+      int i = XINT (val);
+      if (i <= 0)
+       i = pixel_size;
       if (i > 0)
+       {
+         f[XLFD_PIXEL_INDEX] = alloca (22);
        len += sprintf (f[XLFD_PIXEL_INDEX], "%d-*", i) + 1;
-      else if (pixel_size > 0)
-       len += sprintf (f[XLFD_PIXEL_INDEX], "%d-*", pixel_size) + 1;
+       }
+      else
       f[XLFD_PIXEL_INDEX] = "*-*", len += 4;
     }
   else if (FLOATP (val))
     {
+      int i = XFLOAT_DATA (val) * 10;
       f[XLFD_PIXEL_INDEX] = alloca (12);
-      i = XFLOAT_DATA (val) * 10;
       len += sprintf (f[XLFD_PIXEL_INDEX], "*-%d", i) + 1;
     }
   else