From c8796985648290dfe31efbd5956474d1651d3145 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Wed, 11 Nov 1998 03:36:15 +0000 Subject: [PATCH] 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. --- lisp/term/x-win.el | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index d9370a66536..4728a05eda3 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -708,18 +708,17 @@ This is in addition to the primary selection.") (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) -- 2.39.2