# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1097967745 0
# Node ID 201c0ad15e734d0a9310331269f583390047d996
# Parent  1a10f9dbc3ccb28b9e7b08fe94931e6902cfceda
(w32_font_match): Encode font name being matched.

diff -r 1a10f9dbc3cc -r 201c0ad15e73 src/w32fns.c
--- a/src/w32fns.c	Sat Oct 16 23:01:19 2004 +0000
+++ b/src/w32fns.c	Sat Oct 16 23:02:25 2004 +0000
@@ -5370,7 +5370,7 @@
           setup_coding_system
             (Fcheck_coding_system (Vlocale_coding_system), &coding);
 	  coding.src_multibyte = 1;
-	  coding.dst_multibyte = 1;
+	  coding.dst_multibyte = 0;
 	  /* Need to set COMPOSITION_DISABLED, otherwise Emacs crashes in
 	     encode_coding_iso2022 trying to dereference a null pointer.  */
 	  coding.composing = COMPOSITION_DISABLED;
@@ -5607,12 +5607,14 @@
     char * fontname;
     char * pattern;
 {
-  char *regex = alloca (strlen (pattern) * 2 + 3);
-  char *font_name_copy = alloca (strlen (fontname) + 1);
+  char *font_name_copy;
   char *ptr;
-
-  /* Copy fontname so we can modify it during comparison.  */
-  strcpy (font_name_copy, fontname);
+  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++ = '^';