(resolve_face_name): Handle case that FACE_NAME

is not a symbol or string.

2 files changed, 4 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 27830a88e07..69e35f5c975 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2000-10-30  Gerd Moellmann  <gerd@gnu.org>
 
+        * xfaces.c (resolve_face_name): Handle case that FACE_NAME
+        is not a symbol or string.
+
         * xdisp.c (echo_area_display): Don't perform a display update from
         inside redisplay.  The update will happen anyway at the end of
         redisplay, and it can confuse redisplay (GC messages while
diff --git a/src/xfaces.c b/src/xfaces.c
index b0c5dc01258..2edbe148cb2 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -2884,7 +2884,7 @@ resolve_face_name (face_name)
   if (STRINGP (face_name))
     face_name = intern (XSTRING (face_name)->data);
 
-  for (;;)
+  while (SYMBOLP (face_name))
     {
       aliased = Fget (face_name, Qface_alias);
       if (NILP (aliased))