# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1239672363 0
# Node ID b20a4659fd91427ecf7e3be81b81d5d6e72e1474
# Parent  e59697cf41411d12de2c98a79f500739cefbc0bd
(xfont_has_char): The font has C if C is ASCII and the
encoding charset is ascii_compatible.

diff -r e59697cf4141 -r b20a4659fd91 src/xfont.c
--- a/src/xfont.c	Tue Apr 14 01:24:52 2009 +0000
+++ b/src/xfont.c	Tue Apr 14 01:26:03 2009 +0000
@@ -798,10 +798,13 @@
      int c;
 {
   Lisp_Object registry = AREF (entity, FONT_REGISTRY_INDEX);
+  struct charset *encoding;
   struct charset *repertory;
 
-  if (font_registry_charsets (registry, NULL, &repertory) < 0)
+  if (font_registry_charsets (registry, &encoding, &repertory) < 0)
     return -1;
+  if (ASCII_CHAR_P (c) && encoding->ascii_compatible_p)
+    return 1;
   if (! repertory)
     return -1;
   return (ENCODE_CHAR (repertory, c) != CHARSET_INVALID_CODE (repertory));