diff options
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/font.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 030c2a186bf..34a825d0720 100644 --- 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 484f0257546..9e99b81614f 100644 --- 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) |