diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-04-03 08:12:41 -0700 |
|---|---|---|
| committer | Robert Pluim <rpluim@gmail.com> | 2018-06-05 14:08:08 +0200 |
| commit | 97d61f878e6378efbde73923a36f71caac73a4a0 (patch) | |
| tree | f4601d5d78fcb7168f65ae9dac33463aa5538cce /src | |
| parent | f21fa142aca53e3de5783e1ce6fe1bf116174aeb (diff) | |
| download | emacs-97d61f878e6378efbde73923a36f71caac73a4a0.tar.gz | |
Port FC_COLOR change to older fontconfig
Problem reported by John ff in:
https://lists.gnu.org/r/emacs-devel/2018-04/msg00058.html
* src/ftfont.c (ftfont_spec_pattern) [!FC_COLOR]:
Don’t use FC_COLOR on older fontconfigs that don’t have it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ftfont.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index 24a92dd52e8..84e4a303899 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -764,7 +764,7 @@ ftfont_spec_pattern (Lisp_Object spec, char *otlayout, struct OpenTypeSpec **ots if (scalable >= 0 && ! FcPatternAddBool (pattern, FC_SCALABLE, scalable ? FcTrue : FcFalse)) goto err; -#ifdef HAVE_XFT +#if defined HAVE_XFT && defined FC_COLOR /* We really don't like color fonts, they cause Xft crashes. See Bug#30874. */ if (Vxft_ignore_color_fonts |