From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Tue, 24 Nov 2009 08:37:32 +0000 (+0000)
Subject: (font_open_entity): Don't use ASET if font_object is Qnil.
X-Git-Tag: emacs-pretest-23.1.90~253
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=66f5ced096ac1bff2f54f2a653f1a3e12d8c8218;p=emacs.git

(font_open_entity): Don't use ASET if font_object is Qnil.
---

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)
     return Qnil;
 
   font_object = driver_list->driver->open (f, entity, scaled_pixel_size);
-  ASET (font_object, FONT_SIZE_INDEX, make_number (pixel_size));
+  if (!NILP (font_object))
+    ASET (font_object, FONT_SIZE_INDEX, make_number (pixel_size));
   FONT_ADD_LOG ("open", entity, font_object);
   if (NILP (font_object))
     return Qnil;