Mercurial > emacs
changeset 24683:4ff280f1f201
(mouse-set-font): Ensure constructed fontset
matches the font selected in the dialog.
| author | Andrew Innes <andrewi@gnu.org> |
|---|---|
| date | Sun, 02 May 1999 20:39:19 +0000 |
| parents | bf45371ca138 |
| children | cca41b0e7ae7 |
| files | lisp/term/w32-win.el |
| diffstat | 1 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/term/w32-win.el Sun May 02 13:45:39 1999 +0000 +++ b/lisp/term/w32-win.el Sun May 02 20:39:19 1999 +0000 @@ -900,7 +900,7 @@ (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 @@ (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)