# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1200274382 0
# Node ID 8a5868a050832da8188d663c1b299d1e734dbe97
# Parent  04716f23ac87a25f6d221cd8e5c50d2c2fb3ca71
*** empty log message ***

diff -r 04716f23ac87 -r 8a5868a05083 src/font.c
--- a/src/font.c	Mon Jan 14 01:31:25 2008 +0000
+++ b/src/font.c	Mon Jan 14 01:33:02 2008 +0000
@@ -2699,7 +2699,7 @@
 
       if (result > 0)
 	return AREF (entities, i);
-      if (result <= 0)
+      if (result == 0)
 	continue;
       font_object = font_open_for_lface (f, AREF (entities, i), lface, spec);
       if (NILP (font_object))
@@ -3577,9 +3577,12 @@
       for (i = 0; i < len; i++)
 	{
 	  Lisp_Object g = LGSTRING_GLYPH (gstring, i);
-	  unsigned code = LGLYPH_CODE (g);
+	  unsigned code;
 	  struct font_metrics metrics;
 
+	  if (NILP (g))
+	    break;
+	  code = LGLYPH_CODE (g);
 	  if (font->driver->text_extents (font, &code, 1, &metrics) == 0)
 	    {
 	      Lisp_Object gstr = Ffont_make_gstring (font_object,