# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1082686102 0
# Node ID 4d5ade635f7a59c69360f10696bf3b2ff52a8aed
# Parent  450b41d3c07850b00955e1843f6eff320172a538
(char-displayable-p): Simplified by using internal-char-font.

diff -r 450b41d3c078 -r 4d5ade635f7a lisp/international/mule-util.el
--- a/lisp/international/mule-util.el	Fri Apr 23 02:04:13 2004 +0000
+++ b/lisp/international/mule-util.el	Fri Apr 23 02:08:22 2004 +0000
@@ -373,27 +373,7 @@
 	 ;; On a window system, a character is displayable if we have
 	 ;; a font for that character in the default face of the
 	 ;; currently selected frame.
-	 (let ((fontset (frame-parameter (selected-frame) 'font))
-	       font-pattern)
-	   (if (query-fontset fontset)
-	       (setq font-pattern (fontset-font fontset char)))
-	   (or font-pattern
-	       (setq font-pattern (fontset-font "fontset-default" char)))
-	   (if font-pattern
-	       (progn
-		 ;; Now FONT-PATTERN is a string or a cons of family
-		 ;; field pattern and registry field pattern.
-		 (or (stringp 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)))))
+	 (car (internal-char-font nil char)))
 	(t
 	 (let ((coding (terminal-coding-system)))
 	   (if coding