Better resolve bug#72188

* lisp/international/fontset.el (setup-default-fontset) <han>:
Don't search for fonts matching the `han' script elsewhere than
on Android, which restores the status quo existing in Emacs 29.
(bug#72188)
This commit is contained in:
Po Lu 2024-08-01 08:23:36 +08:00
parent ceb5a15222
commit 1154d8aafe

View file

@ -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*")