Mercurial > emacs
changeset 23686:29fd5e07b576
If a resolved ASCII font name doesn't conform to
full XLFD, don't try get information of WEIGHT and SLANT from that
font name.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Wed, 11 Nov 1998 03:36:15 +0000 |
| parents | 14c75dfaaa44 |
| children | 9913df387dfb |
| files | lisp/term/x-win.el |
| diffstat | 1 files changed, 11 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/term/x-win.el Wed Nov 11 03:36:15 1998 +0000 +++ b/lisp/term/x-win.el Wed Nov 11 03:36:15 1998 +0000 @@ -708,18 +708,17 @@ (let ((weight (aref xlfd-fields xlfd-regexp-weight-subnum)) (slant (aref xlfd-fields xlfd-regexp-slant-subnum)) xlfd-temp) - (if (or (not weight) (string-match "[*?]*" weight)) - (progn - (setq xlfd-temp (x-decompose-font-name resolved-name)) - (aset xlfd-fields xlfd-regexp-weight-subnum - (aref xlfd-temp xlfd-regexp-weight-subnum)))) - (if (or (not slant) (string-match "[*?]*" slant)) - (progn - (or xlfd-temp - (setq xlfd-temp - (x-decompose-font-name resolved-name))) - (aset xlfd-fields xlfd-regexp-slant-subnum - (aref xlfd-temp xlfd-regexp-slant-subnum))))) + (if (and (or (not weight) (string-match "[*?]*" weight)) + (setq xlfd-temp + (x-decompose-font-name resolved-name))) + (aset xlfd-fields xlfd-regexp-weight-subnum + (aref xlfd-temp xlfd-regexp-weight-subnum))) + (if (and (or (not slant) (string-match "[*?]*" slant)) + (or xlfd-temp + (setq xlfd-temp + (x-decompose-font-name resolved-name)))) + (aset xlfd-fields xlfd-regexp-slant-subnum + (aref xlfd-temp xlfd-regexp-slant-subnum)))) (setq fontset (x-compose-font-name xlfd-fields)) (create-fontset-from-fontset-spec (concat fontset ", ascii:" font) styles)