Mercurial > emacs

changeset 89607:9090f7eba02c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Fnew_fontset): Check NAME more rigidly.
author Kenichi Handa <handa@m17n.org>
date Fri, 24 Oct 2003 00:44:48 +0000
parents bc6493a5b7ab
children adfad852712a
files src/fontset.c
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;
 }