diff options
| author | Kenichi Handa | 2007-12-18 11:48:01 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2007-12-18 11:48:01 +0000 |
| commit | 2fdf8fd2d7aa27d742afb26c89ec6ef34da2b78e (patch) | |
| tree | c32e447d80642364da49c0fdd42db7ae38a732b5 /src | |
| parent | 771752281dd919fd2d8d579c7cfae5d1d3ae18e3 (diff) | |
| download | emacs-2fdf8fd2d7aa27d742afb26c89ec6ef34da2b78e.tar.gz emacs-2fdf8fd2d7aa27d742afb26c89ec6ef34da2b78e.zip | |
(fontset_find_font): Fix previous change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/fontset.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/fontset.c b/src/fontset.c index 09a57b08a86..1c13c4e8a60 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -662,9 +662,10 @@ fontset_find_font (fontset, c, face, id, fallback) | |||
| 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, |