Mercurial > emacs

changeset 97243:3c62347bccdb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(compute_metrics): Don't mess with glyph_idx setting here.
author Jason Rumney <jasonr@gnu.org>
date Sat, 02 Aug 2008 21:26:08 +0000
parents cc5f94eeb1d8
children b085ed1433f5
files src/ChangeLog src/w32font.c
diffstat 2 files changed, 4 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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;
 }