From: handa <handa>
Date: Wed, 13 Oct 2004 11:14:14 +0000 (+0000)
Subject: (device_open): Be sure to register at least one font
X-Git-Tag: REL-1-2-0~116
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f8af3af70a8af4c4f0f2ee2063fc2556aeedce2;p=m17n%2Fm17n-lib.git

(device_open): Be sure to register at least one font
driver.
---

diff --git a/src/m17n-X.c b/src/m17n-X.c
index dbaf6f2..93e430b 100644
--- a/src/m17n-X.c
+++ b/src/m17n-X.c
@@ -574,8 +574,6 @@ xfont_select (MFrame *frame, MFont *spec, MFont *request, int limited_size){
   if (MPLIST_TAIL_P (plist))
     return NULL;
   best_score = -1, best_font = NULL;
-  if (family == Mnil)
-    family = FONT_PROPERTY (request, MFONT_FAMILY);
   MPLIST_DO (plist, plist)
     {
       if (family == Mnil || family == MPLIST_KEY (plist))
@@ -2044,6 +2042,9 @@ device_open (MFrame *frame, MPlist *param)
 #elif HAVE_FREETYPE
   if (use_freetype)
     mplist_add (frame->font_driver_list, Mfreetype, &mfont__ft_driver);
+#else
+  if (! use_xfont)
+    mplist_add (frame->font_driver_list, Mx, &xfont_driver);
 #endif
   frame->realized_font_list = device->realized_font_list;
   frame->realized_face_list = device->realized_face_list;