# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 972148483 0
# Node ID 3ecb42f00b85fd4b188836c600dba2563208f903
# Parent  7235706eca005f3a2211ee4768bd7f88c92a82f2
(w32_cache_char_metrics): Double check that font is
really fixed pitch before trusting tmPitchAndFamily.

diff -r 7235706eca00 -r 3ecb42f00b85 src/w32term.c
--- a/src/w32term.c	Sat Oct 21 17:12:26 2000 +0000
+++ b/src/w32term.c	Sat Oct 21 17:14:43 2000 +0000
@@ -1284,7 +1284,10 @@
     }
   else
     {
-      if ((font->tm.tmPitchAndFamily & TMPF_FIXED_PITCH) != 0)
+      if (((font->tm.tmPitchAndFamily & TMPF_FIXED_PITCH) != 0)
+          /* Some fonts (eg DBCS fonts) are marked as fixed width even
+             though they contain characters of different widths. */
+          || (font->tm.tmMaxCharWidth != font->tm.tmAveCharWidth))
 	{
 	  /* Font is not fixed pitch, so cache per_char info for the
              ASCII characters.  It would be much more work, and probably