summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenichi Handa <handa@m17n.org>2009-04-30 04:41:39 +0000
committerKenichi Handa <handa@m17n.org>2009-04-30 04:41:39 +0000
commit0ff75233c7b858085be78164a7482affa9e76664 (patch)
tree83a27e4ed2cdb93bd10ede0c939c5eb25ffb919d
parentad3aaf330a79d6a4d42306809abff941b639950f (diff)
downloademacs-0ff75233c7b858085be78164a7482affa9e76664.tar.gz
(fontset_find_font): Check if rfont_def is Qnil or not.
-rw-r--r--src/fontset.c7
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)
for (i = 0; i < ASIZE (vec); i++)
{
Lisp_Object rfont_def = AREF (vec, i);
- Lisp_Object repertory
- = FONT_DEF_REPERTORY (RFONT_DEF_FONT_DEF (rfont_def));
+ Lisp_Object repertory;
+
+ if (NILP (rfont_def))
+ break;
+ repertory = FONT_DEF_REPERTORY (RFONT_DEF_FONT_DEF (rfont_def));
if (XINT (repertory) == id)
{