(w32_per_char_metric): Allow cached metrics to be

returned even when font_type is unknown.

src/ChangeLog

 2003-08-31  Jason Rumney  <jasonr@gnu.org>
 
+	* w32term.c (w32_per_char_metric): Allow cached metrics to be
+	returned even when font_type is unknown.
+
 	* xdisp.c (init_iterator): Remove old WINDOWSNT conditional.
 
 2003-08-30  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>

src/w32term.c

@@ -895,7 +895,6 @@ w32_per_char_metric (font, char2b, font_type)
   BOOL retval;
 
   xassert (font && char2b);
-  xassert (font_type != UNKNOWN_FONT);
 
   /* Handle the common cases quickly.  */
   if (!font->bdf && font->per_char == NULL)
@@ -904,6 +903,8 @@ w32_per_char_metric (font, char2b, font_type)
   else if (!font->bdf && *char2b < 128)
     return &font->per_char[*char2b];
 
+  xassert (font_type != UNKNOWN_FONT);
+
   pcm = &font->scratch;
 
   if (font_type == BDF_1D_FONT)