--- emacs/src/w32fns.c.orig	2005-01-23 22:37:06.000000000 +0900
+++ emacs/src/w32fns.c	2005-01-24 13:21:56.000000000 +0900
@@ -5490,7 +5490,7 @@
       int fields, tem;
       char name[50], weight[20], slant, pitch, pixels[10], height[10],
         width[10], resy[10], remainder[50];
-      char * encoding;
+      char * encoding, * name_underscore;
       int dpi = (int) one_w32_display_info.resy;
 
       fields = sscanf (lpxstr,
@@ -5499,6 +5499,10 @@
       if (fields == EOF)
 	return (FALSE);
 
+      name_underscore = name;
+      while (name_underscore = _mbschr (name_underscore, '_'))
+	*name_underscore = '-';
+
       /* In the general case when wildcards cover more than one field,
 	 we don't know which field is which, so don't fill any in.
 	 However, we need to cope with this particular form, which is