[Emacs-diffs] Changes to emacs/src/xfns.c,v

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/06/13 05:47:42

Index: xfns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfns.c,v
retrieving revision 1.712
retrieving revision 1.713
diff -u -b -r1.712 -r1.713
--- xfns.c      12 Jun 2008 15:29:18 -0000      1.712
+++ xfns.c      13 Jun 2008 05:47:42 -0000      1.713
@@ -3273,6 +3273,7 @@
   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);
@@ -3280,7 +3281,6 @@
   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);
@@ -4816,6 +4816,7 @@
   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);
@@ -4823,7 +4824,6 @@
   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);