From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 19 Feb 2009 03:18:17 +0000 (+0000)
Subject: (Fx_create_frame): Give Xft driver a higher priority.
X-Git-Tag: emacs-pretest-23.0.91~150
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6332668dc76f4069ba497cfbdc9bcc82e99a3770;p=emacs.git

(Fx_create_frame): Give Xft driver a higher priority.
---

diff --git a/src/xfns.c b/src/xfns.c
index f1df3c27d0d..c1c85701160 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3292,7 +3292,6 @@ This function is an internal primitive--use `make-frame' instead.  */)
   f->resx = dpyinfo->resx;
   f->resy = dpyinfo->resy;
 
-  register_font_driver (&xfont_driver, f);
 #ifdef HAVE_FREETYPE
 #ifdef HAVE_XFT
   register_font_driver (&xftfont_driver, f);
@@ -3300,6 +3299,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
   register_font_driver (&ftxfont_driver, f);
 #endif	/* not HAVE_XFT */
 #endif	/* HAVE_FREETYPE */
+  register_font_driver (&xfont_driver, f);
 
   x_default_parameter (f, parms, Qfont_backend, Qnil,
 		       "fontBackend", "FontBackend", RES_TYPE_STRING);