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

Disable fontset-related workaround on non-Android systems

Browse source 
* src/fontset.c (fontset_find_font) [!HAVE_ANDROID]: Don't
refuse to cache font objects whose registries do not agree with
the font specs.  (bug#73363)

Do not merge to master.
This commit is contained in:
Po Lu 2024-09-20 22:29:53 +08:00
parent 4b9a8fd607
commit 7ef805d6a4
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/fontset.c
View file

@ -668,6 +668,7 @@ fontset_find_font (Lisp_Object fontset, int c, struct face *face,
font_object = font_open_for_lface (f, font_entity, face->lface,
FONT_DEF_SPEC (font_def));
#ifdef HAVE_ANDROID
/* If the font registry is not the same as explicitly
specified in the font spec, do not cache the font.
TrueType fonts have contrived character map selection
@ -692,10 +693,13 @@ fontset_find_font (Lisp_Object fontset, int c, struct face *face,
Qiso10646_1)))
goto strangeness;
}
#endif /* HAVE_ANDROID */
if (NILP (font_object))
{
#ifdef HAVE_ANDROID
strangeness:
#endif /* HAVE_ANDROID */
/* Something strange happened, perhaps because of a
Font-backend problem. To avoid crashing, record
that this spec is unusable. It may be better to find