[Emacs-diffs] master 95b77b0: Port FC_COLOR change to older fontconfig

[Paul Eggert]

branch: master
commit 95b77b04516ee52eb3a79f95e1d5eebfb1d9287f
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    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.
---
 src/ftfont.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ftfont.c b/src/ftfont.c
index 24a92dd..84e4a30 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