# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1217712368 0
# Node ID 3c62347bccdb1a39ca895b28b48899cb8a08fbfa
# Parent  cc5f94eeb1d8fa81f36acf9c6ffbb011d1751a66
(compute_metrics): Don't mess with glyph_idx setting here.

diff -r cc5f94eeb1d8 -r 3c62347bccdb src/ChangeLog
--- a/src/ChangeLog	Sat Aug 02 21:07:20 2008 +0000
+++ b/src/ChangeLog	Sat Aug 02 21:26:08 2008 +0000
@@ -1,3 +1,7 @@
+2008-08-02  Jason Rumney  <jasonr@gnu.org>
+
+        * w32font.c (compute_metrics): Don't mess with glyph_idx setting here.
+
 2008-08-02  Eli Zaretskii  <eliz@gnu.org>
 
 	* alloc.c (NSTATICS): Bump to 0x640.
diff -r cc5f94eeb1d8 -r 3c62347bccdb src/w32font.c
--- a/src/w32font.c	Sat Aug 02 21:07:20 2008 +0000
+++ b/src/w32font.c	Sat Aug 02 21:26:08 2008 +0000
@@ -2265,14 +2265,6 @@
       metrics->width = gm.gmCellIncX;
       metrics->status = W32METRIC_SUCCESS;
     }
-  else if (w32_font->glyph_idx)
-    {
-      /* Can't use glyph indexes after all.
-	 Avoid it in future, and clear any metrics that were based on
-	 glyph indexes.  */
-      w32_font->glyph_idx = 0;
-      clear_cached_metrics (w32_font);
-    }
   else
     metrics->status = W32METRIC_FAIL;
 }