From: Po Lu <luangruo@yahoo.com>
Date: Fri, 20 Sep 2024 14:29:53 +0000 (+0800)
Subject: Disable fontset-related workaround on non-Android systems
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~2^2~20^2~391
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7ef805d6a47ef12a40c18d1e449b326f787aa4ea;p=emacs.git

Disable fontset-related workaround on non-Android systems

* 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.
---

diff --git a/src/fontset.c b/src/fontset.c
index 16d14669c89..c332f2a5838 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -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