[Emacs-diffs] Changes to emacs/src/fontset.c [emacs-unicode-2]

[Kenichi Handa]

Index: emacs/src/fontset.c
diff -c emacs/src/fontset.c:1.77.4.3 emacs/src/fontset.c:1.77.4.4
*** emacs/src/fontset.c:1.77.4.3        Thu Oct 23 04:42:39 2003
--- emacs/src/fontset.c Thu Oct 23 20:44:48 2003
***************
*** 1404,1411 ****
  
        elt = Fcar (fontlist);
        script = Fcar (elt);
!       for (elt = Fcdr (elt); ! NILP (elt); elt = Fcdr (elt))
!       Fset_fontset_font (name, script, Fcar (elt), Qnil, Qappend);
      }
    return name;
  }
--- 1404,1415 ----
  
        elt = Fcar (fontlist);
        script = Fcar (elt);
!       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;
  }