diff options
| -rw-r--r-- | lisp/international/fontset.el | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index e3dd5e1c063..b25bf5334e5 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | ;;; Code: | 25 | ;;; Code: |
| 26 | 26 | ||
| 27 | ;; Set default REGISTRY property of charset to find an appropriate | 27 | ;; Set standard REGISTRY property of charset to find an appropriate |
| 28 | ;; font for each charset. This is used to generate a font name in a | 28 | ;; font for each charset. This is used to generate a font name in a |
| 29 | ;; fontset. If the value contains a character `-', the string before | 29 | ;; fontset. If the value contains a character `-', the string before |
| 30 | ;; that is embeded in `CHARSET_REGISTRY' field, and the string after | 30 | ;; that is embeded in `CHARSET_REGISTRY' field, and the string after |
| @@ -363,10 +363,10 @@ by modifying FONTSET-SPEC appropriately. STYLE can be one of `bold', | |||
| 363 | )) | 363 | )) |
| 364 | 364 | ||
| 365 | 365 | ||
| 366 | ;; Create default fontset from 16 dots fonts which are the most widely | 366 | ;; Create standard fontset from 16 dots fonts which are the most widely |
| 367 | ;; installed fonts. | 367 | ;; installed fonts. |
| 368 | (defvar default-fontset-spec | 368 | (defvar standard-fontset-spec |
| 369 | "-*-fixed-medium-r-normal-*-16-*-*-*-*-*-fontset-default, | 369 | "-*-fixed-medium-r-normal-*-16-*-*-*-*-*-fontset-standard, |
| 370 | chinese-gb2312:-*-medium-r-normal-*-16-*-gb2312*-*, | 370 | chinese-gb2312:-*-medium-r-normal-*-16-*-gb2312*-*, |
| 371 | korean-ksc5601:-*-medium-r-normal-*-16-*-ksc5601*-*, | 371 | korean-ksc5601:-*-medium-r-normal-*-16-*-ksc5601*-*, |
| 372 | chinese-cns11643-1:-*-medium-r-normal-*-16-*-cns11643*-1, | 372 | chinese-cns11643-1:-*-medium-r-normal-*-16-*-cns11643*-1, |
| @@ -376,13 +376,15 @@ by modifying FONTSET-SPEC appropriately. STYLE can be one of `bold', | |||
| 376 | chinese-cns11643-5:-*-medium-r-normal-*-16-*-cns11643*-5, | 376 | chinese-cns11643-5:-*-medium-r-normal-*-16-*-cns11643*-5, |
| 377 | chinese-cns11643-6:-*-medium-r-normal-*-16-*-cns11643*-6, | 377 | chinese-cns11643-6:-*-medium-r-normal-*-16-*-cns11643*-6, |
| 378 | chinese-cns11643-7:-*-medium-r-normal-*-16-*-cns11643*-7" | 378 | chinese-cns11643-7:-*-medium-r-normal-*-16-*-cns11643*-7" |
| 379 | "String of fontset spec of a default fontset. | 379 | "String of fontset spec of the standard fontset. |
| 380 | You have the biggest chance to display international characters | ||
| 381 | with correct glyphs by using the standard fontset. | ||
| 380 | See the documentation of `create-fontset-from-fontset-spec' for the format.") | 382 | See the documentation of `create-fontset-from-fontset-spec' for the format.") |
| 381 | 383 | ||
| 382 | ;; Create fontsets from X resources of the name `fontset-N (class | 384 | ;; Create fontsets from X resources of the name `fontset-N (class |
| 383 | ;; Fontset-N)' where N is integer 0, 1, ... | 385 | ;; Fontset-N)' where N is integer 0, 1, ... |
| 384 | ;; The values of the resources the string of the same format as | 386 | ;; The values of the resources the string of the same format as |
| 385 | ;; `default-fontset-spec'. | 387 | ;; `standard-fontset-spec'. |
| 386 | 388 | ||
| 387 | (defun create-fontset-from-x-resource () | 389 | (defun create-fontset-from-x-resource () |
| 388 | (let ((idx 0) | 390 | (let ((idx 0) |