[Emacs-diffs] Changes to emacs/src/font.c,v

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/10/23 04:01:24

Index: font.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/font.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- font.c      14 Oct 2008 14:41:20 -0000      1.88
+++ font.c      23 Oct 2008 04:01:23 -0000      1.89
@@ -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)))));