- (progn
- (aset xlfd-fields xlfd-regexp-registry-subnum
- (substring registry 0 (match-beginning 0)))
- (aset xlfd-fields xlfd-regexp-encoding-subnum
- (substring registry (match-end 0))))
- (aset xlfd-fields xlfd-regexp-registry-subnum
- (concat registry "*"))
- (aset xlfd-fields xlfd-regexp-encoding-subnum "*"))
- (setq fontlist
- (cons (cons charset (x-compose-font-name xlfd-fields t))
- fontlist)))))
+ (setq registry-val (substring registry 0 (match-beginning 0))
+ encoding-val (substring registry (match-end 0)))
+ (setq registry-val (concat registry "*")
+ encoding-val "*"))
+ (aset xlfd-fields xlfd-regexp-registry-subnum registry-val)
+ (aset xlfd-fields xlfd-regexp-encoding-subnum encoding-val)
+ (aset loose-xlfd-fields xlfd-regexp-registry-subnum registry-val)
+ (aset loose-xlfd-fields xlfd-regexp-encoding-subnum encoding-val)
+ (setq fontname (x-compose-font-name xlfd-fields t))
+ (setq fontlist (cons (cons charset fontname) fontlist))
+ (or (assoc fontname alternative-fontname-alist)
+ (setq alternative-fontname-alist
+ (cons (list
+ fontname
+ (x-compose-font-name loose-xlfd-fields t)
+ (concat "*-" registry-val "-" encoding-val))
+ alternative-fontname-alist)))
+ )))