From cc36ddbf04178e89c77faf8b240b3fcf118a8110 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Fri, 24 Oct 2003 00:44:48 +0000 Subject: [PATCH] (Fnew_fontset): Check NAME more rigidly. --- src/fontset.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/fontset.c b/src/fontset.c index 51938488680..1f9939e286e 100644 --- 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; } -- 2.39.2