Mercurial > emacs

changeset 99072:741755a52dcf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(font_add_log): Check the values of extra properties.
author Kenichi Handa <handa@m17n.org>
date Thu, 23 Oct 2008 04:01:23 +0000
parents 39579cd31158
children 2955f4db2183
files src/font.c
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/font.c	Thu Oct 23 03:51:55 2008 +0000
+++ b/src/font.c	Thu Oct 23 04:01:23 2008 +0000
@@ -4810,13 +4810,16 @@
 	   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)))));