[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 0701634: Fix failure of setting default face attrib
From: |
YAMAMOTO Mitsuharu |
Subject: |
[Emacs-diffs] master 0701634: Fix failure of setting default face attribute in init script (Bug#36284) |
Date: |
Wed, 19 Jun 2019 22:59:07 -0400 (EDT) |
branch: master
commit 0701634aa788b316f331ccbb6c44dfd8304a271d
Author: YAMAMOTO Mitsuharu <address@hidden>
Commit: YAMAMOTO Mitsuharu <address@hidden>
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.
---
src/xsettings.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/xsettings.c b/src/xsettings.c
index 3e9012e..06c47c6 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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 0701634: Fix failure of setting default face attribute in init script (Bug#36284),
YAMAMOTO Mitsuharu <=