Commit c8796985 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

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.
parent 9b4d1fe6
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment