Handle fonts with corrupted size specs, i.e. non-int and non-float.
authorChong Yidong <cyd@stupidchicken.com>
Wed, 3 Dec 2008 05:16:38 +0000 (05:16 +0000)
committerChong Yidong <cyd@stupidchicken.com>
Wed, 3 Dec 2008 05:16:38 +0000 (05:16 +0000)
src/font.c

index b933007..41dc9e6 100644 (file)
@@ -3084,10 +3084,13 @@ font_update_lface (f, attrs)
            dpi = XINT (val);
          point = PIXEL_TO_POINT (XINT (AREF (spec, FONT_SIZE_INDEX)) * 10,
                                  dpi);
+         attrs[LFACE_HEIGHT_INDEX] = make_number (point);
        }
       else if (FLOATP (AREF (spec, FONT_SIZE_INDEX)))
-       point = XFLOAT_DATA (AREF (spec, FONT_SIZE_INDEX)) * 10;
-      attrs[LFACE_HEIGHT_INDEX] = make_number (point);
+       {
+         point = XFLOAT_DATA (AREF (spec, FONT_SIZE_INDEX)) * 10;
+         attrs[LFACE_HEIGHT_INDEX] = make_number (point);
+       }
     }
 }