diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ftfont.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index 6b549c3ddf2..696f5e65341 100644 --- a/src/ftfont.c +++ b/src/ftfont.c | |||
| @@ -346,18 +346,15 @@ struct ftfont_cache_data | |||
| 346 | static Lisp_Object | 346 | static Lisp_Object |
| 347 | ftfont_lookup_cache (Lisp_Object key, enum ftfont_cache_for cache_for) | 347 | ftfont_lookup_cache (Lisp_Object key, enum ftfont_cache_for cache_for) |
| 348 | { | 348 | { |
| 349 | Lisp_Object cache, val, entity; | 349 | Lisp_Object cache, val; |
| 350 | struct ftfont_cache_data *cache_data; | 350 | struct ftfont_cache_data *cache_data; |
| 351 | 351 | ||
| 352 | if (FONT_ENTITY_P (key)) | 352 | if (FONT_ENTITY_P (key)) |
| 353 | { | 353 | { |
| 354 | entity = key; | 354 | val = assq_no_quit (QCfont_entity, AREF (key, FONT_EXTRA_INDEX)); |
| 355 | val = assq_no_quit (QCfont_entity, AREF (entity, FONT_EXTRA_INDEX)); | ||
| 356 | eassert (CONSP (val)); | 355 | eassert (CONSP (val)); |
| 357 | key = XCDR (val); | 356 | key = XCDR (val); |
| 358 | } | 357 | } |
| 359 | else | ||
| 360 | entity = Qnil; | ||
| 361 | 358 | ||
| 362 | if (NILP (ft_face_cache)) | 359 | if (NILP (ft_face_cache)) |
| 363 | cache = Qnil; | 360 | cache = Qnil; |