# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1213360177 0
# Node ID ff04c95494e4124b873f97954e906e7f0ac6b7fe
# Parent  c86b69eedb4f14003391484a34f56d1ed86ea5c2
(font_find_for_lface): If registry is NULL, try iso8859-1 and ascii-0.

diff -r c86b69eedb4f -r ff04c95494e4 src/font.c
--- a/src/font.c	Fri Jun 13 12:29:21 2008 +0000
+++ b/src/font.c	Fri Jun 13 12:29:37 2008 +0000
@@ -2896,9 +2896,19 @@
 {
   Lisp_Object work;
   Lisp_Object frame, entities, val, props[FONT_REGISTRY_INDEX + 1] ;
-  Lisp_Object size, foundry[3], *family;
+  Lisp_Object size, foundry[3], *family, registry[3];
   int pixel_size;
-  int i, j, result;
+  int i, j, k, result;
+
+  registry[0] = AREF (spec, FONT_REGISTRY_INDEX);
+  if (NILP (registry[0]))
+    {
+      registry[0] = Qiso8859_1;
+      registry[1] = Qascii_0;
+      registry[2] = null_vector;
+    }
+  else
+    registry[1] = null_vector;
 
   if (c >= 0 && ! NILP (AREF (spec, FONT_REGISTRY_INDEX)))
     {
@@ -2978,21 +2988,23 @@
 	}
     }
 
-  for (j = 0; SYMBOLP (family[j]); j++)
+  for (i = 0; SYMBOLP (family[i]); i++)
     {
-      ASET (work, FONT_FAMILY_INDEX, family[j]);
-      for (i = 0; SYMBOLP (foundry[i]); i++)
+      ASET (work, FONT_FAMILY_INDEX, family[i]);
+      for (j = 0; SYMBOLP (foundry[j]); j++)
 	{
-	  ASET (work, FONT_FOUNDRY_INDEX, foundry[i]);
-	  entities = font_list_entities (frame, work);
-	  if (ASIZE (entities) > 0)
-	    break;
+	  ASET (work, FONT_FOUNDRY_INDEX, foundry[j]);
+	  for (k = 0; SYMBOLP (registry[k]); k++)
+	    {
+	      ASET (work, FONT_REGISTRY_INDEX, registry[j]);
+	      entities = font_list_entities (frame, work);
+	      if (ASIZE (entities) > 0)
+		goto found;
+	    }
 	}
-      if (ASIZE (entities) > 0)
-	break;
     }
-  if (ASIZE (entities) == 0)
-    return Qnil;
+  return Qnil;
+ found:
   if (ASIZE (entities) == 1)
     {
       if (c < 0)