(w32_weight_table): Remove unused variable.

(w32_enumfont_pattern_entity): Use FONT_SPACING_CHARCELL for
backwards compatibility.

diff --git a/src/w32font.c b/src/w32font.c
index 64d48e2ed638806c3afbbed3bc4a9b2fbaf7e19e..6639825e1afa67367bf88dd710e78b13c84373bc 100644 (file)
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -984,7 +984,7 @@ w32_enumfont_pattern_entity (frame, logical_font, physical_font,
   if (physical_font->ntmTm.tmPitchAndFamily & 0x01)
     ASET (entity, FONT_SPACING_INDEX, make_number (FONT_SPACING_PROPORTIONAL));
   else
-    ASET (entity, FONT_SPACING_INDEX, make_number (FONT_SPACING_MONO));
+    ASET (entity, FONT_SPACING_INDEX, make_number (FONT_SPACING_CHARCELL));
 
   if (requested_font->lfQuality != DEFAULT_QUALITY)
     {
@@ -1390,21 +1390,6 @@ w32_registry (w32_charset, font_type)
     }
 }
 
-static struct
-{
-  unsigned w32_numeric;
-  unsigned numeric;
-} w32_weight_table[] =
-  { { FW_THIN, 0 },
-    { FW_EXTRALIGHT, 40 },
-    { FW_LIGHT, 50},
-    { FW_NORMAL, 100},
-    { FW_MEDIUM, 100},
-    { FW_SEMIBOLD, 180},
-    { FW_BOLD, 200},
-    { FW_EXTRABOLD, 205},
-    { FW_HEAVY, 210} };
-
 static int
 w32_decode_weight (fnweight)
      int fnweight;