# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1066956288 0
# Node ID 9090f7eba02c22f9d017b675c8165c60b661a411
# Parent  bc6493a5b7abb62860657202e65351df1219c2e8
(Fnew_fontset): Check NAME more rigidly.

diff -r bc6493a5b7ab -r 9090f7eba02c src/fontset.c
--- a/src/fontset.c	Fri Oct 24 00:42:37 2003 +0000
+++ b/src/fontset.c	Fri Oct 24 00:44:48 2003 +0000
@@ -1404,8 +1404,12 @@
 
       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;
 }