diff options
| -rw-r--r-- | lisp/international/fontset.el | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index 47ee31b4dfa..21776380314 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el | |||
| @@ -359,20 +359,18 @@ | |||
| 359 | 359 | ||
| 360 | (yi ,(font-spec :registry "iso10646-1" :script 'yi)) | 360 | (yi ,(font-spec :registry "iso10646-1" :script 'yi)) |
| 361 | 361 | ||
| 362 | (kana ,(font-spec :registry "iso10646-1" :script 'kana) | 362 | (kana (nil . "JISX0208*") |
| 363 | (nil . "JISX0208*") | ||
| 364 | (nil . "GB2312.1980-0") | 363 | (nil . "GB2312.1980-0") |
| 365 | (nil . "KSC5601.1987*") | 364 | (nil . "KSC5601.1987*") |
| 366 | (nil . "JISX0201*") | 365 | (nil . "JISX0201*") |
| 367 | (nil . "JISX0213.2000-1") | 366 | (nil . "JISX0213.2000-1") |
| 368 | (nil . "JISX0213.2004-1")) | 367 | (nil . "JISX0213.2004-1") |
| 368 | ,(font-spec :registry "iso10646-1" :script 'kana)) | ||
| 369 | 369 | ||
| 370 | (bopomofo ,(font-spec :registry "iso10646-1" :script 'bopomofo) | 370 | (bopomofo ,(font-spec :registry "iso10646-1" :script 'bopomofo) |
| 371 | (nil . "sisheng_cwnn-0")) | 371 | (nil . "sisheng_cwnn-0")) |
| 372 | 372 | ||
| 373 | (han ,(font-spec :registry "iso10646-1" :language 'ja) | 373 | (han (nil . "GB2312.1980-0") |
| 374 | ,(font-spec :registry "iso10646-1" :language 'zh) | ||
| 375 | (nil . "GB2312.1980-0") | ||
| 376 | (nil . "JISX0208*") | 374 | (nil . "JISX0208*") |
| 377 | (nil . "JISX0212*") | 375 | (nil . "JISX0212*") |
| 378 | (nil . "big5*") | 376 | (nil . "big5*") |
| @@ -388,11 +386,11 @@ | |||
| 388 | (nil . "gb18030") | 386 | (nil . "gb18030") |
| 389 | (nil . "JISX0213.2000-1") | 387 | (nil . "JISX0213.2000-1") |
| 390 | (nil . "JISX0213.2000-2") | 388 | (nil . "JISX0213.2000-2") |
| 391 | (nil . "JISX0213.2004-1")) | 389 | (nil . "JISX0213.2004-1") |
| 390 | ,(font-spec :registry "iso10646-1" :lang 'ja) | ||
| 391 | ,(font-spec :registry "iso10646-1" :lang 'zh)) | ||
| 392 | 392 | ||
| 393 | (cjk-misc ,(font-spec :registry "iso10646-1" :language 'ja) | 393 | (cjk-misc (nil . "GB2312.1980-0") |
| 394 | ,(font-spec :registry "iso10646-1" :language 'zh) | ||
| 395 | (nil . "GB2312.1980-0") | ||
| 396 | (nil . "JISX0208*") | 394 | (nil . "JISX0208*") |
| 397 | (nil . "JISX0212*") | 395 | (nil . "JISX0212*") |
| 398 | (nil . "big5*") | 396 | (nil . "big5*") |
| @@ -407,10 +405,12 @@ | |||
| 407 | (nil . "gbk-0") | 405 | (nil . "gbk-0") |
| 408 | (nil . "gb18030") | 406 | (nil . "gb18030") |
| 409 | (nil . "JISX0213.2000-1") | 407 | (nil . "JISX0213.2000-1") |
| 410 | (nil . "JISX0213.2000-2")) | 408 | (nil . "JISX0213.2000-2") |
| 409 | ,(font-spec :registry "iso10646-1" :language 'ja) | ||
| 410 | ,(font-spec :registry "iso10646-1" :language 'zh)) | ||
| 411 | 411 | ||
| 412 | (hangul ,(font-spec :registry "iso10646-1" :language 'ko) | 412 | (hangul (nil . "KSC5601.1987-0") |
| 413 | (nil . "KSC5601.1987-0")) | 413 | ,(font-spec :registry "iso10646-1" :language 'ko)) |
| 414 | 414 | ||
| 415 | (braille ,(font-spec :registry "iso10646-1" :script 'braille)) | 415 | (braille ,(font-spec :registry "iso10646-1" :script 'braille)) |
| 416 | 416 | ||
| @@ -743,6 +743,7 @@ Done when `mouse-set-font' is called." | |||
| 743 | (let (l) | 743 | (let (l) |
| 744 | (dolist (fontset (fontset-list)) | 744 | (dolist (fontset (fontset-list)) |
| 745 | (or (string-match "fontset-default$" fontset) | 745 | (or (string-match "fontset-default$" fontset) |
| 746 | (string-match "fontset-auto[0-9]+$" fontset) | ||
| 746 | (push (list (fontset-plain-name fontset) fontset) l))) | 747 | (push (list (fontset-plain-name fontset) fontset) l))) |
| 747 | (cons "Fontset" | 748 | (cons "Fontset" |
| 748 | (sort l #'(lambda (x y) (string< (car x) (car y))))))) | 749 | (sort l #'(lambda (x y) (string< (car x) (car y))))))) |