(Fnew_fontset): Check NAME more rigidly.

diff --git a/src/fontset.c b/src/fontset.c
index 51938488680b1c7497809f376caa3b18ca7d0387..1f9939e286ef4319a4a905651112976af68f914f 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1404,8 +1404,12 @@ FONT-SPEC is a vector, a cons, or a string.  See the documentation of
 
       elt = Fcar (fontlist);
       script = Fcar (elt);
-      for (elt = Fcdr (elt); ! NILP (elt); elt = Fcdr (elt))
-       Fset_fontset_font (name, script, Fcar (elt), Qnil, Qappend);
+      elt = Fcdr (elt);
+      if (CONSP (elt) && (NILP (XCDR (elt)) || CONSP (XCDR (elt))))
+       for (; CONSP (elt); elt = XCDR (elt))
+         Fset_fontset_font (name, script, XCAR (elt), Qnil, Qappend);
+      else
+       Fset_fontset_font (name, script, elt, Qnil, Qappend);
     }
   return name;
 }