aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2009-11-24 08:37:32 +0000
committerYAMAMOTO Mitsuharu2009-11-24 08:37:32 +0000
commit66f5ced096ac1bff2f54f2a653f1a3e12d8c8218 (patch)
tree687bdb65d6a495b7e92a0c6df1e99e756472c96b /src
parentd1d33062d3d413f85ecd64ecaf565c0faed1e135 (diff)
downloademacs-66f5ced096ac1bff2f54f2a653f1a3e12d8c8218.tar.gz
emacs-66f5ced096ac1bff2f54f2a653f1a3e12d8c8218.zip
(font_open_entity): Don't use ASET if font_object is Qnil.
Diffstat (limited to 'src')
-rw-r--r--src/font.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/font.c b/src/font.c
index 5aa14ca4211..061b6086ac2 100644
--- a/src/font.c
+++ b/src/font.c
@@ -3007,7 +3007,8 @@ font_open_entity (f, entity, pixel_size)
3007 return Qnil; 3007 return Qnil;
3008 3008
3009 font_object = driver_list->driver->open (f, entity, scaled_pixel_size); 3009 font_object = driver_list->driver->open (f, entity, scaled_pixel_size);
3010 ASET (font_object, FONT_SIZE_INDEX, make_number (pixel_size)); 3010 if (!NILP (font_object))
3011 ASET (font_object, FONT_SIZE_INDEX, make_number (pixel_size));
3011 FONT_ADD_LOG ("open", entity, font_object); 3012 FONT_ADD_LOG ("open", entity, font_object);
3012 if (NILP (font_object)) 3013 if (NILP (font_object))
3013 return Qnil; 3014 return Qnil;