(lface_same_font_attributes_p): Compare font attributes

as strings only if both are known to be strings.

diff --git a/src/xfaces.c b/src/xfaces.c
index adfa1716c865c8fc6d9e71440f493844ac40b1ae..1996dae981250b04077879a3b5bdaccb334963a0 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4432,6 +4432,7 @@ lface_same_font_attributes_p (lface1, lface2)
          && EQ (lface1[LFACE_SLANT_INDEX], lface2[LFACE_SLANT_INDEX])
          && (EQ (lface1[LFACE_FONT_INDEX], lface2[LFACE_FONT_INDEX])
              || (STRINGP (lface1[LFACE_FONT_INDEX])
+                 && STRINGP (lface2[LFACE_FONT_INDEX])
                  && xstricmp (XSTRING (lface1[LFACE_FONT_INDEX])->data,
                               XSTRING (lface2[LFACE_FONT_INDEX])->data))));
 }