diff options
| author | Kenichi Handa | 1998-11-11 03:36:15 +0000 |
|---|---|---|
| committer | Kenichi Handa | 1998-11-11 03:36:15 +0000 |
| commit | c8796985648290dfe31efbd5956474d1651d3145 (patch) | |
| tree | 26916befb3688e364dd8e8975137e44becfaed13 | |
| parent | 9b4d1fe69d4e22951849b8b5dc80ed3d2f3c15f1 (diff) | |
| download | emacs-c8796985648290dfe31efbd5956474d1651d3145.tar.gz emacs-c8796985648290dfe31efbd5956474d1651d3145.zip | |
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.
| -rw-r--r-- | lisp/term/x-win.el | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index d9370a66536..4728a05eda3 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el | |||
| @@ -708,18 +708,17 @@ This is in addition to the primary selection.") | |||
| 708 | (let ((weight (aref xlfd-fields xlfd-regexp-weight-subnum)) | 708 | (let ((weight (aref xlfd-fields xlfd-regexp-weight-subnum)) |
| 709 | (slant (aref xlfd-fields xlfd-regexp-slant-subnum)) | 709 | (slant (aref xlfd-fields xlfd-regexp-slant-subnum)) |
| 710 | xlfd-temp) | 710 | xlfd-temp) |
| 711 | (if (or (not weight) (string-match "[*?]*" weight)) | 711 | (if (and (or (not weight) (string-match "[*?]*" weight)) |
| 712 | (progn | 712 | (setq xlfd-temp |
| 713 | (setq xlfd-temp (x-decompose-font-name resolved-name)) | 713 | (x-decompose-font-name resolved-name))) |
| 714 | (aset xlfd-fields xlfd-regexp-weight-subnum | 714 | (aset xlfd-fields xlfd-regexp-weight-subnum |
| 715 | (aref xlfd-temp xlfd-regexp-weight-subnum)))) | 715 | (aref xlfd-temp xlfd-regexp-weight-subnum))) |
| 716 | (if (or (not slant) (string-match "[*?]*" slant)) | 716 | (if (and (or (not slant) (string-match "[*?]*" slant)) |
| 717 | (progn | 717 | (or xlfd-temp |
| 718 | (or xlfd-temp | 718 | (setq xlfd-temp |
| 719 | (setq xlfd-temp | 719 | (x-decompose-font-name resolved-name)))) |
| 720 | (x-decompose-font-name resolved-name))) | 720 | (aset xlfd-fields xlfd-regexp-slant-subnum |
| 721 | (aset xlfd-fields xlfd-regexp-slant-subnum | 721 | (aref xlfd-temp xlfd-regexp-slant-subnum)))) |
| 722 | (aref xlfd-temp xlfd-regexp-slant-subnum))))) | ||
| 723 | (setq fontset (x-compose-font-name xlfd-fields)) | 722 | (setq fontset (x-compose-font-name xlfd-fields)) |
| 724 | (create-fontset-from-fontset-spec | 723 | (create-fontset-from-fontset-spec |
| 725 | (concat fontset ", ascii:" font) styles) | 724 | (concat fontset ", ascii:" font) styles) |