Commit bf970f2b authored by Kenichi Handa's avatar Kenichi Handa
Browse files

(Fx_create_frame, x_create_tip_frame): Register X

font-driver at first.
parent f4cc0153
...@@ -3273,6 +3273,7 @@ This function is an internal primitive--use `make-frame' instead. */) ...@@ -3273,6 +3273,7 @@ This function is an internal primitive--use `make-frame' instead. */)
f->resx = dpyinfo->resx; f->resx = dpyinfo->resx;
f->resy = dpyinfo->resy; f->resy = dpyinfo->resy;
register_font_driver (&xfont_driver, f);
#ifdef HAVE_FREETYPE #ifdef HAVE_FREETYPE
#ifdef HAVE_XFT #ifdef HAVE_XFT
register_font_driver (&xftfont_driver, f); register_font_driver (&xftfont_driver, f);
...@@ -3280,7 +3281,6 @@ This function is an internal primitive--use `make-frame' instead. */) ...@@ -3280,7 +3281,6 @@ This function is an internal primitive--use `make-frame' instead. */)
register_font_driver (&ftxfont_driver, f); register_font_driver (&ftxfont_driver, f);
#endif /* not HAVE_XFT */ #endif /* not HAVE_XFT */
#endif /* HAVE_FREETYPE */ #endif /* HAVE_FREETYPE */
register_font_driver (&xfont_driver, f);
x_default_parameter (f, parms, Qfont_backend, Qnil, x_default_parameter (f, parms, Qfont_backend, Qnil,
"fontBackend", "FontBackend", RES_TYPE_STRING); "fontBackend", "FontBackend", RES_TYPE_STRING);
...@@ -4816,6 +4816,7 @@ x_create_tip_frame (dpyinfo, parms, text) ...@@ -4816,6 +4816,7 @@ x_create_tip_frame (dpyinfo, parms, text)
f->resx = dpyinfo->resx; f->resx = dpyinfo->resx;
f->resy = dpyinfo->resy; f->resy = dpyinfo->resy;
register_font_driver (&xfont_driver, f);
#ifdef HAVE_FREETYPE #ifdef HAVE_FREETYPE
#ifdef HAVE_XFT #ifdef HAVE_XFT
register_font_driver (&xftfont_driver, f); register_font_driver (&xftfont_driver, f);
...@@ -4823,7 +4824,6 @@ x_create_tip_frame (dpyinfo, parms, text) ...@@ -4823,7 +4824,6 @@ x_create_tip_frame (dpyinfo, parms, text)
register_font_driver (&ftxfont_driver, f); register_font_driver (&ftxfont_driver, f);
#endif /* not HAVE_XFT */ #endif /* not HAVE_XFT */
#endif /* HAVE_FREETYPE */ #endif /* HAVE_FREETYPE */
register_font_driver (&xfont_driver, f);
x_default_parameter (f, parms, Qfont_backend, Qnil, x_default_parameter (f, parms, Qfont_backend, Qnil,
"fontBackend", "FontBackend", RES_TYPE_STRING); "fontBackend", "FontBackend", RES_TYPE_STRING);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment