From 49f9c344472822b5366df3f71cf2e2adb5433def Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 23 Oct 2008 04:02:19 +0000 Subject: [PATCH] (font_add_log): Check the values of extra properties. --- src/ChangeLog | 4 ++++ src/font.c | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 472108f1a8..09cd14012a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2008-10-23 Kenichi Handa + + * font.c (font_add_log): Check the values of extra properties. + 2008-10-22 Martin Rudalics * window.c (Fwindow_dedicated_p, Fset_window_dedicated_p): diff --git a/src/font.c b/src/font.c index a9ddd8353a..5e09323cf6 100644 --- a/src/font.c +++ b/src/font.c @@ -4810,13 +4810,16 @@ font_add_log (action, arg, result) tail = XCDR (tail)) { elt = XCAR (tail); - if (EQ (XCAR (elt), QCscript)) + if (EQ (XCAR (elt), QCscript) + && SYMBOLP (XCDR (elt))) val = concat3 (val, SYMBOL_NAME (QCscript), concat2 (equalstr, SYMBOL_NAME (XCDR (elt)))); - else if (EQ (XCAR (elt), QClang)) + else if (EQ (XCAR (elt), QClang) + && SYMBOLP (XCDR (elt))) val = concat3 (val, SYMBOL_NAME (QClang), concat2 (equalstr, SYMBOL_NAME (XCDR (elt)))); - else if (EQ (XCAR (elt), QCotf) && CONSP (XCDR (elt))) + else if (EQ (XCAR (elt), QCotf) + && CONSP (XCDR (elt)) && SYMBOLP (XCAR (XCDR (elt)))) val = concat3 (val, SYMBOL_NAME (QCotf), concat2 (equalstr, SYMBOL_NAME (XCAR (XCDR (elt))))); -- 2.20.1