[Emacs-diffs] emacs/src xfns.c

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/02/19 03:18:18

Modified files:
        src            : xfns.c 

Log message:
        (Fx_create_frame): Give Xft driver a higher priority.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xfns.c?cvsroot=emacs&r1=1.735&r2=1.736

Patches:
Index: xfns.c
===================================================================
RCS file: /sources/emacs/emacs/src/xfns.c,v
retrieving revision 1.735
retrieving revision 1.736
diff -u -b -r1.735 -r1.736
--- xfns.c      6 Feb 2009 16:49:35 -0000       1.735
+++ xfns.c      19 Feb 2009 03:18:17 -0000      1.736
@@ -3292,7 +3292,6 @@
   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 @@
   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);