diff options
| author | Chong Yidong | 2009-02-19 03:18:17 +0000 |
|---|---|---|
| committer | Chong Yidong | 2009-02-19 03:18:17 +0000 |
| commit | 6332668dc76f4069ba497cfbdc9bcc82e99a3770 (patch) | |
| tree | 2e62fe395790efc5bcc1664f3fa175819e4d81b2 /src | |
| parent | 1a3b7ca63e2afd0f136c84ff9173d97c7cca456f (diff) | |
| download | emacs-6332668dc76f4069ba497cfbdc9bcc82e99a3770.tar.gz emacs-6332668dc76f4069ba497cfbdc9bcc82e99a3770.zip | |
(Fx_create_frame): Give Xft driver a higher priority.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfns.c | 2 |
1 files changed, 1 insertions, 1 deletions
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. */) | |||
| 3292 | f->resx = dpyinfo->resx; | 3292 | f->resx = dpyinfo->resx; |
| 3293 | f->resy = dpyinfo->resy; | 3293 | f->resy = dpyinfo->resy; |
| 3294 | 3294 | ||
| 3295 | register_font_driver (&xfont_driver, f); | ||
| 3296 | #ifdef HAVE_FREETYPE | 3295 | #ifdef HAVE_FREETYPE |
| 3297 | #ifdef HAVE_XFT | 3296 | #ifdef HAVE_XFT |
| 3298 | register_font_driver (&xftfont_driver, f); | 3297 | register_font_driver (&xftfont_driver, f); |
| @@ -3300,6 +3299,7 @@ This function is an internal primitive--use `make-frame' instead. */) | |||
| 3300 | register_font_driver (&ftxfont_driver, f); | 3299 | register_font_driver (&ftxfont_driver, f); |
| 3301 | #endif /* not HAVE_XFT */ | 3300 | #endif /* not HAVE_XFT */ |
| 3302 | #endif /* HAVE_FREETYPE */ | 3301 | #endif /* HAVE_FREETYPE */ |
| 3302 | register_font_driver (&xfont_driver, f); | ||
| 3303 | 3303 | ||
| 3304 | x_default_parameter (f, parms, Qfont_backend, Qnil, | 3304 | x_default_parameter (f, parms, Qfont_backend, Qnil, |
| 3305 | "fontBackend", "FontBackend", RES_TYPE_STRING); | 3305 | "fontBackend", "FontBackend", RES_TYPE_STRING); |