# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1080531699 0
# Node ID 4860d5ef058739954aed4451ce689108681a35ae
# Parent  df2f0fcc5fa20ea22c96a5405112b7d68db82246
(char-displayable-p): Fix generation of XLFD file name.

diff -r df2f0fcc5fa2 -r 4860d5ef0587 lisp/international/mule-util.el
--- a/lisp/international/mule-util.el	Mon Mar 29 02:58:56 2004 +0000
+++ b/lisp/international/mule-util.el	Mon Mar 29 03:41:39 2004 +0000
@@ -384,10 +384,15 @@
 		 ;; Now FONT-PATTERN is a string or a cons of family
 		 ;; field pattern and registry field pattern.
 		 (or (stringp font-pattern)
-		     (setq font-pattern (concat "-"
-						(or (car font-pattern) "*")
-						"-*-"
-						(cdr font-pattern))))
+		     (let ((family (or (car font-pattern) "*"))
+			   (registry (or (cdr font-pattern) "*")))
+		       (or (string-match "-" family)
+			   (setq family (concat "*-" family)))
+		       (or (string-match "-" registry)
+			   (setq registry (concat registry "-*")))
+		       (setq font-pattern
+			     (format "-%s-*-*-*-*-*-*-*-*-*-*-%s"
+				     family registry))))
 		 (x-list-fonts font-pattern 'default (selected-frame) 1)))))
 	(t
 	 (let ((coding (terminal-coding-system)))