Mercurial > emacs
comparison lisp/term/x-win.el @ 22515:c7f3d4ec2c69
When creating a fontset from a specified ASCII
font, don't use the resolved fon tname for the new fontset name.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Sat, 20 Jun 1998 01:38:52 +0000 |
parents | 50b8918e3c60 |
children | 5dee1f64801f |
comparison
equal
deleted
inserted
replaced
22514:dee11277c07d | 22515:c7f3d4ec2c69 |
---|---|
672 ;; yet handled here. | 672 ;; yet handled here. |
673 | 673 |
674 (let ((font (or (cdr (assq 'font initial-frame-alist)) | 674 (let ((font (or (cdr (assq 'font initial-frame-alist)) |
675 (cdr (assq 'font default-frame-alist)) | 675 (cdr (assq 'font default-frame-alist)) |
676 (x-get-resource "font" "Font"))) | 676 (x-get-resource "font" "Font"))) |
677 resolved-name xlfd-fields) | 677 xlfd-fields) |
678 (if (and font | 678 (if (and font |
679 (not (query-fontset font)) | 679 (not (query-fontset font)) |
680 (setq resolved-name (x-resolve-font-name font)) | 680 (x-resolve-font-name font) |
681 (setq xlfd-fields (x-decompose-font-name resolved-name))) | 681 (setq xlfd-fields (x-decompose-font-name font))) |
682 (if (string= "fontset" | 682 (if (string= "fontset" |
683 (aref xlfd-fields xlfd-regexp-registry-subnum)) | 683 (aref xlfd-fields xlfd-regexp-registry-subnum)) |
684 (new-fontset font (x-complement-fontset-spec xlfd-fields nil)) | 684 (new-fontset font (x-complement-fontset-spec xlfd-fields nil)) |
685 ;; Create a fontset from FONT. The fontset name is | 685 ;; Create a fontset from FONT. The fontset name is |
686 ;; generated from FONT. Create style variants of the | 686 ;; generated from FONT. Create style variants of the |