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

[Miles Bader]

Index: emacs/src/fontset.c
diff -c emacs/src/fontset.c:1.77.4.20 emacs/src/fontset.c:1.77.4.21
*** emacs/src/fontset.c:1.77.4.20       Tue Jul  6 02:57:10 2004
--- emacs/src/fontset.c Fri Oct 22 10:13:34 2004
***************
*** 1126,1143 ****
  
    for (i = 0; i < ASIZE (Vfontset_table); i++)
      {
!       Lisp_Object fontset;
!       unsigned char *this_name;
  
        fontset = FONTSET_FROM_ID (i);
        if (NILP (fontset)
          || !BASE_FONTSET_P (fontset))
        continue;
  
!       this_name = SDATA (FONTSET_NAME (fontset));
        if (regexpp
!         ? fast_c_string_match_ignore_case (name, this_name) >= 0
!         : !strcmp (SDATA (name), this_name))
        return i;
      }
    return -1;
--- 1126,1142 ----
  
    for (i = 0; i < ASIZE (Vfontset_table); i++)
      {
!       Lisp_Object fontset, this_name;
  
        fontset = FONTSET_FROM_ID (i);
        if (NILP (fontset)
          || !BASE_FONTSET_P (fontset))
        continue;
  
!       this_name = FONTSET_NAME (fontset);
        if (regexpp
!         ? fast_string_match (name, this_name) >= 0
!         : !strcmp (SDATA (name), SDATA (this_name)))
        return i;
      }
    return -1;
***************
*** 1189,1207 ****
  
    for (id = 0; id < ASIZE (Vfontset_table); id++)
      {
!       Lisp_Object fontset;
!       unsigned char *name;
  
        fontset = FONTSET_FROM_ID (id);
        if (NILP (fontset)
          || !BASE_FONTSET_P (fontset)
          || !EQ (frame, FONTSET_FRAME (fontset)))
        continue;
!       name = SDATA (FONTSET_NAME (fontset));
  
        if (STRINGP (regexp)
!         ? (fast_c_string_match_ignore_case (regexp, name) < 0)
!         : strcmp (SDATA (pattern), name))
        continue;
  
        val = Fcons (Fcopy_sequence (FONTSET_NAME (fontset)), val);
--- 1188,1205 ----
  
    for (id = 0; id < ASIZE (Vfontset_table); id++)
      {
!       Lisp_Object fontset, name;
  
        fontset = FONTSET_FROM_ID (id);
        if (NILP (fontset)
          || !BASE_FONTSET_P (fontset)
          || !EQ (frame, FONTSET_FRAME (fontset)))
        continue;
!       name = FONTSET_NAME (fontset);
  
        if (STRINGP (regexp)
!         ? (fast_string_match (regexp, name) < 0)
!         : strcmp (SDATA (pattern), SDATA (name)))
        continue;
  
        val = Fcons (Fcopy_sequence (FONTSET_NAME (fontset)), val);