From: Po Lu Date: Thu, 1 Aug 2024 00:23:36 +0000 (+0800) Subject: Better resolve bug#72188 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=28a4b196970c2678103cb7b3c4ff14c46534728d;p=emacs.git Better resolve bug#72188 * lisp/international/fontset.el (setup-default-fontset) : Don't search for fonts matching the `han' script elsewhere than on Android, which restores the status quo existing in Emacs 29. (bug#72188) (cherry picked from commit 1154d8aafe2f4702b8fc775835f830fd00cfbaaf) --- diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index d4e24899d11..3e16e1f35bd 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el @@ -700,10 +700,11 @@ (nil . "JISX0213.2004-1") ,(font-spec :registry "iso10646-1" :lang 'ja) ,(font-spec :registry "iso10646-1" :lang 'zh) - ;; 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 'han)) + ;; This is required on Android, as otherwise many TrueType + ;; fonts with CJK characters but no corresponding ``design + ;; language'' declaration can't be found. + ,@(and (featurep 'android) + (list (font-spec :registry "iso10646-1" :script 'han)))) (cjk-misc (nil . "GB2312.1980-0") (nil . "JISX0208*")