(w32_per_char_metric): Allow cached metrics to be

returned even when font_type is unknown.

diff --git a/src/ChangeLog b/src/ChangeLog
index 394a6b17ddbc550983737f614d0a23d23c9758a8..a3cfba048055eb8653aa4be6ddcf2406e7a138e9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 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\e,Ad\e(Brv  <jan.h.d@swipnet.se>

diff --git a/src/w32term.c b/src/w32term.c
index d98f93e439f5c9186032efcdd7c6ba1f3c394519..16e0f4667c06be76a3a2b274ea93a979af1b2599 100644 (file)
--- a/src/w32term.c
+++ b/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)