/[emacs]/emacs/src/fontset.c
ViewVC logotype

Diff of /emacs/src/fontset.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.77.4.20 by miles, Tue Jul 6 02:57:10 2004 UTC revision 1.77.4.21 by miles, Fri Oct 22 10:13:34 2004 UTC
# Line 1126  fs_query_fontset (name, regexpp) Line 1126  fs_query_fontset (name, regexpp)
1126    
1127    for (i = 0; i < ASIZE (Vfontset_table); i++)    for (i = 0; i < ASIZE (Vfontset_table); i++)
1128      {      {
1129        Lisp_Object fontset;        Lisp_Object fontset, this_name;
       unsigned char *this_name;  
1130    
1131        fontset = FONTSET_FROM_ID (i);        fontset = FONTSET_FROM_ID (i);
1132        if (NILP (fontset)        if (NILP (fontset)
1133            || !BASE_FONTSET_P (fontset))            || !BASE_FONTSET_P (fontset))
1134          continue;          continue;
1135    
1136        this_name = SDATA (FONTSET_NAME (fontset));        this_name = FONTSET_NAME (fontset);
1137        if (regexpp        if (regexpp
1138            ? fast_c_string_match_ignore_case (name, this_name) >= 0            ? fast_string_match (name, this_name) >= 0
1139            : !strcmp (SDATA (name), this_name))            : !strcmp (SDATA (name), SDATA (this_name)))
1140          return i;          return i;
1141      }      }
1142    return -1;    return -1;
# Line 1189  list_fontsets (f, pattern, size) Line 1188  list_fontsets (f, pattern, size)
1188    
1189    for (id = 0; id < ASIZE (Vfontset_table); id++)    for (id = 0; id < ASIZE (Vfontset_table); id++)
1190      {      {
1191        Lisp_Object fontset;        Lisp_Object fontset, name;
       unsigned char *name;  
1192    
1193        fontset = FONTSET_FROM_ID (id);        fontset = FONTSET_FROM_ID (id);
1194        if (NILP (fontset)        if (NILP (fontset)
1195            || !BASE_FONTSET_P (fontset)            || !BASE_FONTSET_P (fontset)
1196            || !EQ (frame, FONTSET_FRAME (fontset)))            || !EQ (frame, FONTSET_FRAME (fontset)))
1197          continue;          continue;
1198        name = SDATA (FONTSET_NAME (fontset));        name = FONTSET_NAME (fontset);
1199    
1200        if (STRINGP (regexp)        if (STRINGP (regexp)
1201            ? (fast_c_string_match_ignore_case (regexp, name) < 0)            ? (fast_string_match (regexp, name) < 0)
1202            : strcmp (SDATA (pattern), name))            : strcmp (SDATA (pattern), SDATA (name)))
1203          continue;          continue;
1204    
1205        val = Fcons (Fcopy_sequence (FONTSET_NAME (fontset)), val);        val = Fcons (Fcopy_sequence (FONTSET_NAME (fontset)), val);

Legend:
Removed from v.1.77.4.20  
changed lines
  Added in v.1.77.4.21

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26