aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPo Lu2024-08-01 08:23:36 +0800
committerPo Lu2024-08-01 08:23:36 +0800
commit1154d8aafe2f4702b8fc775835f830fd00cfbaaf (patch)
tree847b940eaf4a0fd3c2434c1403eab38da4565a1a
parentceb5a1522270c41d0c9f5e6b52d61e3173f72f1d (diff)
downloademacs-1154d8aafe2f4702b8fc775835f830fd00cfbaaf.tar.gz
emacs-1154d8aafe2f4702b8fc775835f830fd00cfbaaf.zip
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)
-rw-r--r--lisp/international/fontset.el9
1 files changed, 5 insertions, 4 deletions
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 @@
697 (nil . "JISX0213.2004-1") 697 (nil . "JISX0213.2004-1")
698 ,(font-spec :registry "iso10646-1" :lang 'ja) 698 ,(font-spec :registry "iso10646-1" :lang 'ja)
699 ,(font-spec :registry "iso10646-1" :lang 'zh) 699 ,(font-spec :registry "iso10646-1" :lang 'zh)
700 ;; This is required, as otherwise many TrueType fonts with 700 ;; This is required on Android, as otherwise many TrueType
701 ;; CJK characters but no corresponding ``design language'' 701 ;; fonts with CJK characters but no corresponding ``design
702 ;; declaration can't be found. 702 ;; language'' declaration can't be found.
703 ,(font-spec :registry "iso10646-1" :script 'han)) 703 ,@(and (featurep 'android)
704 (list (font-spec :registry "iso10646-1" :script 'han))))
704 705
705 (cjk-misc (nil . "GB2312.1980-0") 706 (cjk-misc (nil . "GB2312.1980-0")
706 (nil . "JISX0208*") 707 (nil . "JISX0208*")