(x-complement-fontset-spec): If a fontname doesn't conform to XLFD

format, try to get XLFD name by x-list-fonts.

diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index e0f21f5f6e33c3568389e20d291bfb5f7897c76d..a48d7db5a56116c57262ada35a56b577cdc7c508 100644 (file)
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -552,7 +552,9 @@ XLFD-FIELDS."
     (dolist (elt fontlist)
       (let ((name (cadr elt))
            font-spec)
-       (when (string-match xlfd-style-regexp name)
+       (when (or (string-match xlfd-style-regexp name)
+                 (and (setq name (car (x-list-fonts name nil nil 1)))
+                      (string-match xlfd-style-regexp name)))
          (setq font-spec (make-vector 6 nil))
          (dotimes (i 6)
            (aset font-spec i (match-string (1+ i) name)))