From: handa <handa>
Date: Mon, 19 Sep 2005 00:45:36 +0000 (+0000)
Subject: (mface__realize): Fix logic of opening a font.
X-Git-Tag: REL-1-3-0~165
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1604f58a401951d8d0edeae6d203685d354a6c7;p=m17n%2Fm17n-lib.git

(mface__realize): Fix logic of opening a font.
---

diff --git a/src/face.c b/src/face.c
index 36ce285..db7c807 100644
--- a/src/face.c
+++ b/src/face.c
@@ -692,14 +692,16 @@ mface__realize (MFrame *frame, MFace **faces, int num, int size, MFont *font)
       mfont_put_prop (&spec, Mregistry, Miso8859_1);
       spec.source = MFONT_SOURCE_X;
       font = mfont__select (frame, &spec, 0);
-      if (! font)
+      if (font)
+	rfont = mfont__open (frame, font, &spec);
+      if (! rfont)
 	{
 	  mfont_put_prop (&spec, Mregistry, Municode_bmp);
 	  spec.source = MFONT_SOURCE_FT;
 	  font = mfont__select (frame, &spec, 0);
+	  if (font)
+	    rfont = mfont__open (frame, font, &spec);
 	}
-      if (font)
-	rfont = mfont__open (frame, font, &spec);
     }
   if (! rfont)
     rfont = mfont__lookup_fontset (rface->rfontset, NULL, &num,