diff options
| author | Kenichi Handa <[email protected]> | 2000-12-29 06:14:42 +0000 |
|---|---|---|
| committer | Kenichi Handa <[email protected]> | 2000-12-29 06:14:42 +0000 |
| commit | f6cab6c82f2f59fce01954cfacd1822ec7573fdc (patch) | |
| tree | 3f2c2d0746f93b866e85894a45c1affc08f0d3ac | |
| parent | 2b3f28a4d0799e04669b3cbf1da0fb7c40182fe5 (diff) | |
(x-complement-fontset-spec): Resolve
ASCII font name so that the same family name is used for fonts
registered in x-font-name-charset-alist.
(create-fontset-from-fontset-spec): Adjusted for the above change.
The name of fontset alias should be a unresolved ASCII font name.
| -rw-r--r-- | lisp/international/fontset.el | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index fe3d56d21d..f2c42208ac 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el @@ -314,13 +314,14 @@ FONTLIST. If a font specifid for ASCII supports the other charsets (see the variable `x-font-name-charset-alist'), add that information to FONTLIST." - (let ((ascii-font (cdr (assq 'ascii fontlist)))) - - ;; If font for ASCII is not specified, add it. - (unless ascii-font + (let* ((slot (assq 'ascii fontlist)) + (ascii-font (cdr slot))) + (if ascii-font + (setcdr slot (setq ascii-font (x-resolve-font-name ascii-font))) + ;; If font for ASCII is not specified, add it. (aset xlfd-fields xlfd-regexp-registry-subnum "iso8859") (aset xlfd-fields xlfd-regexp-encoding-subnum "1") - (setq ascii-font (x-compose-font-name xlfd-fields)) + (setq ascii-font (x-resolve-font-name (x-compose-font-name xlfd-fields))) (setq fontlist (cons (cons 'ascii ascii-font) fontlist))) ;; If the font for ASCII also supports the other charsets, and @@ -428,6 +429,7 @@ It returns a name of the created fontset." (if (charsetp charset) (setq fontlist (cons (cons charset (match-string 2 fontset-spec)) fontlist)))) + (setq ascii-font (cdr (assq 'ascii fontlist))) ;; Complement FONTLIST. (setq fontlist (x-complement-fontset-spec xlfd-fields fontlist)) @@ -443,7 +445,8 @@ It returns a name of the created fontset." (cons (cons name alias) fontset-alias-alist))))) ;; Define the ASCII font name alias. - (setq ascii-font (cdr (assq 'ascii fontlist))) + (or ascii-font + (setq ascii-font (cdr (assq 'ascii fontlist)))) (or (rassoc ascii-font fontset-alias-alist) (setq fontset-alias-alist (cons (cons name ascii-font) |