From: Jason Rumney <jasonr@gnu.org>
Date: Sat, 2 Aug 2008 21:26:08 +0000 (+0000)
Subject: (compute_metrics): Don't mess with glyph_idx setting here.
X-Git-Tag: emacs-pretest-23.0.90~3684
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4ff1bf172efc2afd5dd76bd3e457ae7b816a747e;p=emacs.git

(compute_metrics): Don't mess with glyph_idx setting here.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index cd355044499..c74d93b9c64 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/w32font.c b/src/w32font.c
index 4a2812560ee..74c74ee0750 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -2265,14 +2265,6 @@ compute_metrics (dc, w32_font, code, metrics)
       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;
 }