From: handa <handa>
Date: Fri, 24 Mar 2006 12:57:42 +0000 (+0000)
Subject: (mfontset__get_font): Fix for the case that no font in
X-Git-Tag: REL-1-3-4~185
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=578bc5ff4ba66d50f8784cdac9f89c46edc7c8ac;p=m17n%2Fm17n-lib.git

(mfontset__get_font): Fix for the case that no font in
per_script list is available.
---

diff --git a/src/fontset.c b/src/fontset.c
index 4dd3fe6..fee964b 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -888,11 +888,12 @@ mfontset__get_font (MFrame *frame, MFontset *fontset,
   if (best)
     *best = 0;
 
+  if (language == Mnil)
+    language = Mt;
+
   if (script != Mnil)
     {
       per_script = get_per_script (fontset, script);
-      if (language == Mnil)
-	language = Mt;
       if ((per_lang = mplist_get (per_script, language))
 	  && (rfont = get_font_from_group (frame, per_lang, font)))
 	{
@@ -928,7 +929,7 @@ mfontset__get_font (MFrame *frame, MFontset *fontset,
 	}
     }
 
-  if (language != Mnil)
+  if (language != Mt)
     MPLIST_DO (per_script, fontset->per_script)
       {
 	if ((per_lang = mplist_get (MPLIST_PLIST (per_script), language))