From 81af6e72e267e16bdf3c122bbaaa99e242abaa46 Mon Sep 17 00:00:00 2001 From: Andrew Innes Date: Sun, 2 May 1999 20:39:19 +0000 Subject: (mouse-set-font): Ensure constructed fontset matches the font selected in the dialog. --- lisp/term/w32-win.el | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'lisp/term/w32-win.el') diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index 5f1f6d4ab09..39eb15bac29 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el @@ -900,7 +900,7 @@ with the font." (if (fboundp 'new-fontset) (append w32-fixed-font-alist (list (generate-fontset-menu))))))) (if fonts - (let (font fontset) + (let (font fontset xlfd resolved-font) (while fonts (condition-case nil (progn @@ -908,7 +908,17 @@ with the font." (if (fontset-name-p font) (setq fontset font) (condition-case nil - (setq fontset (create-fontset-from-ascii-font font)) + (setq resolved-font (x-resolve-font-name font) + xlfd (x-decompose-font-name resolved-font) + fontset + (create-fontset-from-ascii-font + font resolved-font + (format "%s_%s_%s_%s" + (aref xlfd xlfd-regexp-family-subnum) + (aref xlfd xlfd-regexp-registry-subnum) + (aref xlfd xlfd-regexp-encoding-subnum) + (aref xlfd + xlfd-regexp-pixelsize-subnum)))) (error nil))) (if fontset (set-default-font fontset) -- cgit v1.2.1