From: Po Lu <luangruo@yahoo.com>
Date: Mon, 5 Aug 2024 01:34:11 +0000 (+0800)
Subject: Also condition cjk-misc font-spec on Android
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~2^2~20^2~592
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1c7e00f4f653cf3d30006cefe6568227dcb91c60;p=emacs.git

Also condition cjk-misc font-spec on Android

* lisp/international/fontset.el (setup-default-fontset)
<cjk-misc>: Don't search for matching scripts elsewhere than on
Android.
---

diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index d60349e05e3..b52ac1994c2 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -724,7 +724,9 @@
                ;; This is required, as otherwise many TrueType fonts
                ;; with CJK characters but no corresponding ``design
                ;; language'' declaration can't be found.
-               ,(font-spec :registry "iso10646-1" :script 'cjk-misc))
+               ,@(and (featurep 'android)
+                      (list (font-spec :registry "iso10646-1"
+                                       :script 'cjk-misc))))
 
      (hangul (nil . "KSC5601.1987-0")
 	     ,(font-spec :registry "iso10646-1" :lang 'ko))