(font_list_entities): Fix the car part of data to be

stored in the cache.

diff --git a/src/ChangeLog b/src/ChangeLog
index 030c2a186bff1bd3e2cc1efa74708536fcc58106..34a825d07203f609d44e0c315ef16bb347cefd11 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2008-05-31  Kenichi Handa  <handa@m17n.org>
 
+       * font.c (font_list_entities): Fix the car part of data to be
+       stored in the cache.
+
        * ftfont.c (ftfont_font_format): Don't use strcasestr.
 
 2008-05-30  Stefan Monnier  <monnier@iro.umontreal.ca>

diff --git a/src/font.c b/src/font.c
index 484f02575467bd156086f417adaa2d03aec156fc..9e99b81614f38a3d0a58801382446954ddf4151c 100644 (file)
--- a/src/font.c
+++ b/src/font.c
@@ -2441,6 +2441,8 @@ font_list_entities (frame, spec)
        Lisp_Object cache = font_get_cache (f, driver_list->driver);
        Lisp_Object tail = alternate_familes;
 
+       ASET (scratch_font_spec, FONT_TYPE_INDEX, driver_list->driver->type);
+       ASET (scratch_font_spec, FONT_FAMILY_INDEX, family);
        while (1)
          {
            val = assoc_no_quit (scratch_font_spec, XCDR (cache));
@@ -2452,6 +2454,7 @@ font_list_entities (frame, spec)
 
                val = driver_list->driver->list (frame, scratch_font_spec);
                copy = Fcopy_font_spec (scratch_font_spec);
+               ASET (copy, FONT_TYPE_INDEX, driver_list->driver->type);
                XSETCDR (cache, Fcons (Fcons (copy, val), XCDR (cache)));
              }
            if (! NILP (val) && need_filtering)