diff options
| author | Kenichi Handa | 2009-04-30 04:41:39 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2009-04-30 04:41:39 +0000 |
| commit | 0ff75233c7b858085be78164a7482affa9e76664 (patch) | |
| tree | 83a27e4ed2cdb93bd10ede0c939c5eb25ffb919d /src | |
| parent | ad3aaf330a79d6a4d42306809abff941b639950f (diff) | |
| download | emacs-0ff75233c7b858085be78164a7482affa9e76664.tar.gz emacs-0ff75233c7b858085be78164a7482affa9e76664.zip | |
(fontset_find_font): Check if rfont_def is Qnil or not.
Diffstat (limited to 'src')
| -rw-r--r-- | src/fontset.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/fontset.c b/src/fontset.c index 3eb835401f2..bd9f719423a 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -547,8 +547,11 @@ fontset_find_font (fontset, c, face, id, fallback) | |||
| 547 | for (i = 0; i < ASIZE (vec); i++) | 547 | for (i = 0; i < ASIZE (vec); i++) |
| 548 | { | 548 | { |
| 549 | Lisp_Object rfont_def = AREF (vec, i); | 549 | Lisp_Object rfont_def = AREF (vec, i); |
| 550 | Lisp_Object repertory | 550 | Lisp_Object repertory; |
| 551 | = FONT_DEF_REPERTORY (RFONT_DEF_FONT_DEF (rfont_def)); | 551 | |
| 552 | if (NILP (rfont_def)) | ||
| 553 | break; | ||
| 554 | repertory = FONT_DEF_REPERTORY (RFONT_DEF_FONT_DEF (rfont_def)); | ||
| 552 | 555 | ||
| 553 | if (XINT (repertory) == id) | 556 | if (XINT (repertory) == id) |
| 554 | { | 557 | { |