Index: src/w32fns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32fns.c,v
retrieving revision 1.219.2.11
diff -u -r1.219.2.11 w32fns.c
--- src/w32fns.c	22 Oct 2004 10:13:34 -0000	1.219.2.11
+++ src/w32fns.c	1 Nov 2004 15:41:37 -0000
@@ -5667,14 +5667,12 @@
     char * fontname;
     char * pattern;
 {
-  char *font_name_copy;
-  char *ptr;
-  Lisp_Object encoded_font_name;
   char *regex = alloca (strlen (pattern) * 2 + 3);
+  char *font_name_copy = alloca (strlen (fontname) + 1);
+  char *ptr;
 
-  /* Convert fontname to unibyte for match.  */
-  encoded_font_name = string_make_unibyte (build_string (fontname));
-  font_name_copy = SDATA (encoded_font_name);
+   /* Copy fontname so we can modify it during comparison.  */
+  strcpy (font_name_copy, fontname);
 
   ptr = regex;
   *ptr++ = '^';
@@ -5712,8 +5710,8 @@
       return FALSE;
   }
 
-  return (fast_c_string_match_ignore_case (build_string (regex),
-                                           font_name_copy) >= 0);
+  return (fast_string_match_ignore_case (build_string (regex),
+                                         build_string (fontname)) >= 0);
 }
 
 /* Callback functions, and a structure holding info they need, for