Mercurial > emacs
comparison src/fontset.c @ 102417:5a5d05398f9e
(fontset_find_font): Fix previous change.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Thu, 05 Mar 2009 12:40:18 +0000 |
| parents | 5988cd89cf0b |
| children | c50bd87f030b |
comparison
equal
deleted
inserted
replaced
| 102416:6c045af4e5ae | 102417:5a5d05398f9e |
|---|---|
| 629 { | 629 { |
| 630 rfont_def = AREF (vec, i); | 630 rfont_def = AREF (vec, i); |
| 631 if (! EQ (RFONT_DEF_FONT_DEF (rfont_def), font_def)) | 631 if (! EQ (RFONT_DEF_FONT_DEF (rfont_def), font_def)) |
| 632 break; | 632 break; |
| 633 font_object = RFONT_DEF_OBJECT (AREF (vec, i)); | 633 font_object = RFONT_DEF_OBJECT (AREF (vec, i)); |
| 634 xassert (! NILP (font_object)); | 634 if (! NILP (font_object) && font_has_char (f, font_object, c)) |
| 635 if (font_has_char (f, font_object, c)) | |
| 636 return rfont_def; | 635 return rfont_def; |
| 637 } | 636 } |
| 638 | 637 |
| 639 /* Find a font-entity with the current spec and supporting C. */ | 638 /* Find a font-entity with the current spec and supporting C. */ |
| 640 font_entity = font_find_for_lface (f, face->lface, | 639 font_entity = font_find_for_lface (f, face->lface, |