From: Kenichi Handa <handa@m17n.org>
Date: Wed, 6 Dec 2006 11:54:55 +0000 (+0000)
Subject: (xftfont_open): Call FcConfigSubstitute.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~638
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3cc2aca0acc2e01c49e61412b03559e59dfa5a86;p=emacs.git

(xftfont_open): Call FcConfigSubstitute.
---

diff --git a/src/xftfont.c b/src/xftfont.c
index 5cbb7efe038..ce648cc018d 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -240,6 +240,10 @@ xftfont_open (f, entity, pixel_size)
   FcPatternAddString (pat, FC_FILE, file);
   FcPatternAddDouble (pat, FC_PIXEL_SIZE, pixel_size);
   /*FcPatternAddBool (pat, FC_ANTIALIAS, FcTrue);*/
+  val = AREF (entity, FONT_FAMILY_INDEX);
+  if (! NILP (val))
+    FcPatternAddString (pat, FC_FAMILY, (FcChar8 *) SDATA (SYMBOL_NAME (val)));
+  FcConfigSubstitute (NULL, pat, FcMatchPattern);
 
   BLOCK_INPUT;
   XftDefaultSubstitute (display, FRAME_X_SCREEN_NUMBER (f), pat);