diff options
| author | Chong Yidong | 2008-12-03 05:16:38 +0000 |
|---|---|---|
| committer | Chong Yidong | 2008-12-03 05:16:38 +0000 |
| commit | 2cf4d521ac33da1905b549374eb6c3b3b0e86867 (patch) | |
| tree | aa4e726dd0d94d6f3fc5edf027bcc04e7972fd86 /src | |
| parent | ba207571de95dfcd549ea4d70eff4de2cad4c76f (diff) | |
| download | emacs-2cf4d521ac33da1905b549374eb6c3b3b0e86867.tar.gz emacs-2cf4d521ac33da1905b549374eb6c3b3b0e86867.zip | |
Handle fonts with corrupted size specs, i.e. non-int and non-float.
Diffstat (limited to 'src')
| -rw-r--r-- | src/font.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/font.c b/src/font.c index b933007f40c..41dc9e61626 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -3084,10 +3084,13 @@ font_update_lface (f, attrs) | |||
| 3084 | dpi = XINT (val); | 3084 | dpi = XINT (val); |
| 3085 | point = PIXEL_TO_POINT (XINT (AREF (spec, FONT_SIZE_INDEX)) * 10, | 3085 | point = PIXEL_TO_POINT (XINT (AREF (spec, FONT_SIZE_INDEX)) * 10, |
| 3086 | dpi); | 3086 | dpi); |
| 3087 | attrs[LFACE_HEIGHT_INDEX] = make_number (point); | ||
| 3087 | } | 3088 | } |
| 3088 | else if (FLOATP (AREF (spec, FONT_SIZE_INDEX))) | 3089 | else if (FLOATP (AREF (spec, FONT_SIZE_INDEX))) |
| 3089 | point = XFLOAT_DATA (AREF (spec, FONT_SIZE_INDEX)) * 10; | 3090 | { |
| 3090 | attrs[LFACE_HEIGHT_INDEX] = make_number (point); | 3091 | point = XFLOAT_DATA (AREF (spec, FONT_SIZE_INDEX)) * 10; |
| 3092 | attrs[LFACE_HEIGHT_INDEX] = make_number (point); | ||
| 3093 | } | ||
| 3091 | } | 3094 | } |
| 3092 | } | 3095 | } |
| 3093 | 3096 | ||