From: Jason Rumney <jasonr@gnu.org>
Date: Sun, 31 Aug 2003 22:15:15 +0000 (+0000)
Subject: (w32_per_char_metric): Allow cached metrics to be
X-Git-Tag: ttn-vms-21-2-B4~8939
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4bc2315e9ee39791abb683a4ba4b27e7a69d862a;p=emacs.git

(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 394a6b17ddb..a3cfba04805 100644
--- 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,Ad(Brv  <jan.h.d@swipnet.se>
diff --git a/src/w32term.c b/src/w32term.c
index d98f93e439f..16e0f4667c0 100644
--- 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)