Mercurial > emacs
comparison src/fontset.c @ 91250:2de541db2c82
(fontset_find_font): Fix previous change.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Tue, 18 Dec 2007 11:48:01 +0000 |
parents | 6133244f82b7 |
children | 3cd59392b3ec |
comparison
equal
deleted
inserted
replaced
91249:4f21471103e6 | 91250:2de541db2c82 |
---|---|
660 FONTSET_FALLBACK (fontset) = vec; | 660 FONTSET_FALLBACK (fontset) = vec; |
661 } | 661 } |
662 if (EQ (vec, Qt)) | 662 if (EQ (vec, Qt)) |
663 return Qnil; | 663 return Qnil; |
664 | 664 |
665 if (XINT (AREF (vec, 0)) != charset_ordered_list_tick | 665 if (ASIZE (vec) > 4 |
666 || XINT (AREF (vec, 1)) != id | 666 && (XINT (AREF (vec, 0)) != charset_ordered_list_tick |
667 || NILP (Fequal (AREF (vec, 2), face->lface[LFACE_FAMILY_INDEX]))) | 667 || XINT (AREF (vec, 1)) != id |
668 || NILP (Fequal (AREF (vec, 2), face->lface[LFACE_FAMILY_INDEX])))) | |
668 /* We have just created VEC, | 669 /* We have just created VEC, |
669 or the charset priorities were changed, | 670 or the charset priorities were changed, |
670 or the preferred charset was changed, | 671 or the preferred charset was changed, |
671 or the preferred family was changed. */ | 672 or the preferred family was changed. */ |
672 reorder_font_vector (vec, id, face->lface[LFACE_FAMILY_INDEX]); | 673 reorder_font_vector (vec, id, face->lface[LFACE_FAMILY_INDEX]); |