From: Kenichi Handa <handa@m17n.org>
Date: Fri, 17 Nov 2006 10:57:12 +0000 (+0000)
Subject: (xic_create_xfontset): Try the default fontset name as a
X-Git-Tag: emacs-pretest-23.0.90~8295^2~689
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=278109a9ddd5b47b417c632fb0be7a3d3961959e;p=emacs.git

(xic_create_xfontset): Try the default fontset name as a
last resort.
---

diff --git a/src/xfns.c b/src/xfns.c
index d1a5def4c34..0825f770c63 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2151,6 +2151,17 @@ xic_create_xfontset (f, base_fontname)
 	    }
 	}
       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))