summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2018-04-03 08:12:41 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2018-04-03 08:13:17 -0700
commit95b77b04516ee52eb3a79f95e1d5eebfb1d9287f (patch)
tree42db9d1a92e7496b2708a36e8ddea73370e684ec /src
parent408bf21a8c8b5bf5a78785608255463ad1038871 (diff)
downloademacs-95b77b04516ee52eb3a79f95e1d5eebfb1d9287f.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.c2
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