diff options
author | Alad Wenter | 2019-11-05 10:32:19 +0100 |
---|---|---|
committer | Alad Wenter | 2019-11-05 10:32:19 +0100 |
commit | a136385fb784131f6f3a51c62804d25f30502aba (patch) | |
tree | 3844de30073df1a27758bd0933bcc72774d8c13a /0001-Ignore-color-fonts-when-using-Xft.patch | |
parent | ac4adb26f28f163efa90a5a55b825eb2c9578f15 (diff) | |
download | aur-a136385fb784131f6f3a51c62804d25f30502aba.tar.gz |
upgpkg: emacs 26.3-1
Diffstat (limited to '0001-Ignore-color-fonts-when-using-Xft.patch')
-rw-r--r-- | 0001-Ignore-color-fonts-when-using-Xft.patch | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/0001-Ignore-color-fonts-when-using-Xft.patch b/0001-Ignore-color-fonts-when-using-Xft.patch deleted file mode 100644 index e17130658ff3..000000000000 --- a/0001-Ignore-color-fonts-when-using-Xft.patch +++ /dev/null @@ -1,72 +0,0 @@ -From f21fa142aca53e3de5783e1ce6fe1bf116174aeb Mon Sep 17 00:00:00 2001 -From: Robert Pluim <rpluim@gmail.com> -Date: Tue, 3 Apr 2018 11:06:01 +0200 -Subject: [PATCH] Ignore color fonts when using Xft - -* src/font.c (syms_of_font): New configuration variable -xft-ignore-color-fonts, default t. -* src/ftfont.c (ftfont_spec_pattern): Tell fontconfig to ignore -color fonts if xft-ignore-color-fonts is t. (Bug#30874, Bug#30045) -* etc/NEWS: Document xft-ignore-color-fonts. ---- - etc/NEWS | 6 ++++++ - src/font.c | 7 +++++++ - src/ftfont.c | 7 +++++++ - 3 files changed, 20 insertions(+) - -diff --git a/etc/NEWS b/etc/NEWS -index 873e2dfd1d..2bec8de0ea 100644 ---- a/etc/NEWS -+++ b/etc/NEWS -@@ -31,6 +31,12 @@ in its NEWS.) - - * Changes in Emacs 26.2 - -+--- -+** New variable 'xft-ignore-color-fonts'. -+Default t means don't try to load color fonts when using Xft, as they -+often cause crashes. Set it to nil if you really need those fonts. -+(Bug#30874) -+ - - * Editing Changes in Emacs 26.2 - -diff --git a/src/font.c b/src/font.c -index e53935a15c..305bb14576 100644 ---- a/src/font.c -+++ b/src/font.c -@@ -5476,6 +5476,13 @@ Disabling compaction of font caches might enlarge the Emacs memory - footprint in sessions that use lots of different fonts. */); - inhibit_compacting_font_caches = 0; - -+ DEFVAR_BOOL ("xft-ignore-color-fonts", -+ Vxft_ignore_color_fonts, -+ doc: /* -+Non-nil means don't query fontconfig for color fonts, since they often -+cause Xft crashes. Only has an effect in Xft builds. */); -+ Vxft_ignore_color_fonts = 1; -+ - #ifdef HAVE_WINDOW_SYSTEM - #ifdef HAVE_FREETYPE - syms_of_ftfont (); -diff --git a/src/ftfont.c b/src/ftfont.c -index c2e093e633..24a92dd52e 100644 ---- a/src/ftfont.c -+++ b/src/ftfont.c -@@ -764,6 +764,13 @@ 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 -+ /* We really don't like color fonts, they cause Xft crashes. See -+ Bug#30874. */ -+ if (Vxft_ignore_color_fonts -+ && ! FcPatternAddBool(pattern, FC_COLOR, FcFalse)) -+ goto err; -+#endif - - goto finish; - --- -2.17.1 - |