From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 3 Apr 2018 15:12:41 +0000 (-0700)
Subject: Port FC_COLOR change to older fontconfig
X-Git-Tag: emacs-26.1.90~388
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=97d61f878e6378efbde73923a36f71caac73a4a0;p=emacs.git

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.
---

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