[Emacs-diffs] Changes to emacs/src/w32fns.c

[Jason Rumney]

Index: emacs/src/w32fns.c
diff -c emacs/src/w32fns.c:1.244 emacs/src/w32fns.c:1.245
*** emacs/src/w32fns.c:1.244    Tue Nov  2 08:21:16 2004
--- emacs/src/w32fns.c  Tue Nov  2 08:55:10 2004
***************
*** 5607,5620 ****
      char * fontname;
      char * pattern;
  {
-   char *font_name_copy;
    char *ptr;
!   Lisp_Object encoded_font_name;
    char *regex = alloca (strlen (pattern) * 2 + 3);
  
!   /* Convert fontname to unibyte for match.  */
!   encoded_font_name = string_make_unibyte (build_string (fontname));
!   font_name_copy = SDATA (encoded_font_name);
  
    ptr = regex;
    *ptr++ = '^';
--- 5607,5618 ----
      char * fontname;
      char * pattern;
  {
    char *ptr;
!   char *font_name_copy;
    char *regex = alloca (strlen (pattern) * 2 + 3);
  
!   font_name_copy = alloca (strlen (fontname) + 1);
!   strcpy (font_name_copy, fontname);
  
    ptr = regex;
    *ptr++ = '^';
***************
*** 5652,5659 ****
        return FALSE;
    }
  
!   return (fast_c_string_match_ignore_case (build_string (regex),
!                                            font_name_copy) >= 0);
  }
  
  /* Callback functions, and a structure holding info they need, for
--- 5650,5657 ----
        return FALSE;
    }
  
!   return (fast_string_match_ignore_case (build_string (regex),
!                                          build_string(font_name_copy)) >= 0);
  }
  
  /* Callback functions, and a structure holding info they need, for