# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1163761032 0
# Node ID a81dd6ff9caacd45375a6b0287cb6fb6afdc1a2d
# Parent  486295710f09ceeffd06a89a7ab36b544f63f710
(xic_create_xfontset): Try the default fontset name as a
last resort.

diff -r 486295710f09 -r a81dd6ff9caa src/xfns.c
--- a/src/xfns.c	Thu Nov 16 08:08:28 2006 +0000
+++ b/src/xfns.c	Fri Nov 17 10:57:12 2006 +0000
@@ -2151,6 +2151,17 @@
 	    }
 	}
       xfree (fontsetname);
+      if (! xfs && base_fontname != xic_defaut_fontset)
+	{
+	  /* Try the default fontset name at a last resort.  */
+	  fontsetname = xic_create_fontsetname (xic_defaut_fontset, False);
+	  xfs = XCreateFontSet (FRAME_X_DISPLAY (f),
+				fontsetname, &missing_list,
+				&missing_count, &def_string);
+	  if (missing_list)
+	    XFreeStringList (missing_list);
+	  xfree (fontsetname);
+	}
     }
 
   if (FRAME_XIC_BASE_FONTNAME (f))