*** empty log message ***

diff --git a/src/ChangeLog b/src/ChangeLog
index 9c0e58bdacfccb5324e76ad8121126f2f4cfc312..0a04daf0c5b57872c351ceffe23852a404be02d5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,25 @@
+2008-05-19  Kenichi Handa  <handa@m17n.org>
+
+       * font.c (font_list_entities): Fix handling of cache.
+       (font_matching_entity): Likewise.
+
+       * ftfont.c (cs_iso8859_1): Deleted.
+       (ft_face_cache): New variable.
+       (struct ftfont_info): New member fc_charset_idx;
+       (ftfont_build_basic_charsets): Deleted.
+       (fc_charset_table): New variable.
+       (ftfont_pattern_entity): New arg fc_charset_idx.  Store (FILENAME
+       . FC_CHARSET_IDX) as :font-entity property in the font entity.
+       Callers changed.
+       (ftfont_lookup_cache, ftfont_get_charset): New funcitons.
+       (ftfont_spec_pattern): New argument fc_charset_idx.  Check
+       registry more rigidly.  Callers changed.
+       (ftfont_open, ftfont_close, ftfont_has_char): Adjustd for the
+       change of :font-entity property of the font.
+
+       * xftfont.c (xftfont_open): Ajusted for the change of :font-entity
+       property of the font.
+
 2008-05-18  Juanma Barranquero  <lekktu@gmail.com>
 
        * coding.c (Fcoding_system_p): Rename argument to match docstring.

diff --git a/src/font.h b/src/font.h
index 3c5645b31eb9bc4e36908cd4ef42ec900ceb8314..e66b5fd90de71a941eed0a46dcf0a109be251f7c 100644 (file)
--- a/src/font.h
+++ b/src/font.h
@@ -179,7 +179,7 @@ enum font_property_index
        is not available.  */
     FONT_FILE_INDEX,
 
-    /* Format of the font (symbol).  */
+    /* Format of the font (symbol) or nil if unknown.  */
     FONT_FORMAT_INDEX,
 
     /* This value is the length of font-object vector.  */