aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/international/fontset.el4
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)))