[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 97d61f8 2/3: Port FC_COLOR change to older fontco
From: |
Robert Pluim |
Subject: |
[Emacs-diffs] emacs-26 97d61f8 2/3: Port FC_COLOR change to older fontconfig |
Date: |
Tue, 5 Jun 2018 08:53:37 -0400 (EDT) |
branch: emacs-26
commit 97d61f878e6378efbde73923a36f71caac73a4a0
Author: Paul Eggert <address@hidden>
Commit: Robert Pluim <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