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.

(cherry picked from commit 1c7e00f4f653cf3d30006cefe6568227dcb91c60)

diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index c9b60418b227e37792320d410124f59d2715362d..a4456d31cf9eef152e26f39304b51d598a636909 100644 (file)
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -726,7 +726,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))