diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2019-06-20 11:57:50 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2019-06-20 11:58:36 +0900 |
| commit | 0701634aa788b316f331ccbb6c44dfd8304a271d (patch) | |
| tree | 72bac97d44b72b218b37b51c2f63fe4bffafbc7a /src/xsettings.c | |
| parent | 9eb78866476d843889361ca725e6cbd48d06c2fc (diff) | |
| download | emacs-0701634aa788b316f331ccbb6c44dfd8304a271d.tar.gz | |
Fix failure of setting default face attribute in init script (Bug#36284)
* src/xsettings.c (apply_xft_settings): Undo replacing all #ifdef HAVE_XFT
with #if defined USE_CAIRO || defined HAVE_XFT for this function.
Diffstat (limited to 'src/xsettings.c')
| -rw-r--r-- | src/xsettings.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/xsettings.c b/src/xsettings.c index 3e9012e3ab1..06c47c6c6ce 100644 --- a/src/xsettings.c +++ b/src/xsettings.c @@ -608,18 +608,16 @@ static void apply_xft_settings (struct x_display_info *dpyinfo, struct xsettings *settings) { -#if defined USE_CAIRO || defined HAVE_XFT +#ifdef HAVE_XFT FcPattern *pat; struct xsettings oldsettings; bool changed = false; memset (&oldsettings, 0, sizeof (oldsettings)); pat = FcPatternCreate (); -#ifdef HAVE_XFT XftDefaultSubstitute (dpyinfo->display, XScreenNumberOfScreen (dpyinfo->screen), pat); -#endif FcPatternGetBool (pat, FC_ANTIALIAS, 0, &oldsettings.aa); FcPatternGetBool (pat, FC_HINTING, 0, &oldsettings.hinting); #ifdef FC_HINT_STYLE @@ -719,9 +717,7 @@ apply_xft_settings (struct x_display_info *dpyinfo, }; char buf[sizeof format + d_formats * d_growth + lf_formats * lf_growth]; -#ifdef HAVE_XFT XftDefaultSet (dpyinfo->display, pat); -#endif store_config_changed_event (Qfont_render, XCAR (dpyinfo->name_list_element)); Vxft_settings @@ -733,7 +729,7 @@ apply_xft_settings (struct x_display_info *dpyinfo, } else FcPatternDestroy (pat); -#endif /* USE_CAIRO || HAVE_XFT */ +#endif /* HAVE_XFT */ } /* Read XSettings from the display for DPYINFO. |