# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 961500193 0
# Node ID 6f3f0ca4a3596af12914a5fd784c96fd0d39d5b9
# Parent  c8e5453dc85da33b4467d4a9ab12dccf0dc691ad
(font_list): Handle the case that REGISTRY doesn't contain information
about ENCODING.

diff -r c8e5453dc85d -r 6f3f0ca4a359 src/xfaces.c
--- a/src/xfaces.c	Tue Jun 20 11:22:32 2000 +0000
+++ b/src/xfaces.c	Tue Jun 20 11:23:13 2000 +0000
@@ -2470,12 +2470,19 @@
       registry_str = (NILP (registry) ? "*" : (char *) XSTRING (registry)->data);
       
       pattern_str = (char *) alloca (strlen (family_str)
-				 + strlen (registry_str)
-				 + 10);
-      if (index (family_str, '-'))
-	sprintf (pattern_str, "-%s-*-%s", family_str, registry_str);
-      else
-	sprintf (pattern_str, "-*-%s-*-%s", family_str, registry_str);
+				     + strlen (registry_str)
+				     + 10);
+      strcpy (pattern_str, index (family_str, '-') ? "-" : "-*-");
+      strcat (pattern_str, family_str);
+      strcat (pattern_str, "-*-");
+      strcat (pattern_str, registry_str);
+      if (!index (registry_str, '-'))
+	{
+	  if (registry_str[strlen (registry_str) - 1] == '*')
+	    strcat (pattern_str, "-*");
+	  else
+	    strcat (pattern_str, "*-*");
+	}
     }
   else
     pattern_str = (char *) XSTRING (pattern)->data;