From: Po Lu Date: Thu, 1 Aug 2024 00:23:36 +0000 (+0800) Subject: Better resolve bug#72188 X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~2^2~20^2~608 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1154d8aafe2f4702b8fc775835f830fd00cfbaaf;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) --- diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index 33e444507c4..d60349e05e3 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el @@ -697,10 +697,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*")