diff options
| author | Kenichi Handa | 2003-01-06 01:12:14 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2003-01-06 01:12:14 +0000 |
| commit | dcda246bb99ffb8f0a7773bfcebe90aa193573df (patch) | |
| tree | 85e9cbdffb06443d89405915952ba6f3e24f97f0 | |
| parent | ddbe25cd99fc9bfb2ca2b5f05e0c946f7bf64432 (diff) | |
| download | emacs-dcda246bb99ffb8f0a7773bfcebe90aa193573df.tar.gz emacs-dcda246bb99ffb8f0a7773bfcebe90aa193573df.zip | |
(x-complement-fontset-spec): If a fontname doesn't conform to XLFD
format, try to get XLFD name by x-list-fonts.
| -rw-r--r-- | lisp/international/fontset.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index e0f21f5f6e3..a48d7db5a56 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el | |||
| @@ -552,7 +552,9 @@ XLFD-FIELDS." | |||
| 552 | (dolist (elt fontlist) | 552 | (dolist (elt fontlist) |
| 553 | (let ((name (cadr elt)) | 553 | (let ((name (cadr elt)) |
| 554 | font-spec) | 554 | font-spec) |
| 555 | (when (string-match xlfd-style-regexp name) | 555 | (when (or (string-match xlfd-style-regexp name) |
| 556 | (and (setq name (car (x-list-fonts name nil nil 1))) | ||
| 557 | (string-match xlfd-style-regexp name))) | ||
| 556 | (setq font-spec (make-vector 6 nil)) | 558 | (setq font-spec (make-vector 6 nil)) |
| 557 | (dotimes (i 6) | 559 | (dotimes (i 6) |
| 558 | (aset font-spec i (match-string (1+ i) name))) | 560 | (aset font-spec i (match-string (1+ i) name))) |