procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Workaround a libotf crash with Kannada font (bug#30193)

Browse source 
* configure.ac (HAVE_OTF_KANNADA_BUG): New define.
* src/xfaces.c (syms_of_xfaces) <Vface_ignored_fonts>:
Add problematic Kannada font if necessary.
This commit is contained in:
Glenn Morris 2018-01-26 19:53:20 -08:00
parent e3b46f0b9e
commit 2ce56c51a8
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
configure.ac
View file

@ -3303,6 +3303,11 @@ if test "${HAVE_X11}" = "yes"; then
AC_DEFINE(HAVE_OTF_GET_VARIATION_GLYPHS, 1,
[Define to 1 if libotf has OTF_get_variation_glyphs.])
fi
EMACS_CHECK_MODULES([OTFOK], [libotf >= 0.9.16])
if test "$HAVE_OTFOK" != "yes"; then
AC_DEFINE(HAVE_OTF_KANNADA_BUG, 1,
[Define to 1 if libotf is affected by https://debbugs.gnu.org/28110.])
fi
fi
fi
dnl FIXME should there be an error if HAVE_FREETYPE != yes?

5
src/xfaces.c
View file

@ -6526,7 +6526,12 @@ other font of the appropriate family and registry is available. */);
doc: /* List of ignored fonts.
Each element is a regular expression that matches names of fonts to
ignore. */);
#ifdef HAVE_OTF_KANNADA_BUG
/* https://debbugs.gnu.org/30193 */
Vface_ignored_fonts = list1 (build_string ("Noto Serif Kannada"));
#else
Vface_ignored_fonts = Qnil;
#endif
DEFVAR_LISP ("face-remapping-alist", Vface_remapping_alist,
doc: /* Alist of face remappings.