Commit 6bf84cde authored by Kenichi Handa's avatar Kenichi Handa
Browse files

(x-complement-fontset-spec): In the

case that we use ASCII font for the other charsets, use only
family and regisry part of it.
parent 119171dd
......@@ -315,7 +315,8 @@ 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* ((slot (assq 'ascii fontlist))
(ascii-font (cdr slot)))
(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.
......@@ -326,6 +327,16 @@ variable `x-font-name-charset-alist'), add that information to FONTLIST."
;; If the font for ASCII also supports the other charsets, and
;; they are not specified in FONTLIST, add them.
(setq xlfd-fields (x-decompose-font-name ascii-font))
(if (not xlfd-fields)
(setq ascii-font-spec ascii-font)
(setq ascii-font-spec
(cons (format "%s-%s"
(aref xlfd-fields xlfd-regexp-foundry-subnum)
(aref xlfd-fields xlfd-regexp-family-subnum))
(format "%s-%s"
(aref xlfd-fields xlfd-regexp-registry-subnum)
(aref xlfd-fields xlfd-regexp-encoding-subnum)))))
(let ((tail x-font-name-charset-alist)
(while tail
......@@ -337,7 +348,7 @@ variable `x-font-name-charset-alist'), add that information to FONTLIST."
(setq charset (car charsets) charsets (cdr charsets))
(or (assq charset fontlist)
(setq fontlist
(cons (cons charset ascii-font) fontlist))))))))
(cons (cons charset ascii-font-spec) fontlist))))))))
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