[Emacs-diffs] Changes to emacs/src/w32font.c,v

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   08/05/27 08:29:42

Index: w32font.c
===================================================================
RCS file: /sources/emacs/emacs/src/w32font.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- w32font.c   26 May 2008 14:05:38 -0000      1.29
+++ w32font.c   27 May 2008 08:29:41 -0000      1.30
@@ -796,11 +796,16 @@
                sizeof (TEXTMETRIC));
       else
         metrics = NULL;
+
+      /* If it supports outline metrics, it should support Glyph Indices.  */
+      w32_font->glyph_idx = ETO_GLYPH_INDEX;
     }
+
   if (!metrics)
+    {
     GetTextMetrics (dc, &w32_font->metrics);
-
-  w32_font->glyph_idx = ETO_GLYPH_INDEX;
+      w32_font->glyph_idx = 0;
+    }
 
   w32_font->cached_metrics = NULL;
   w32_font->n_cache_blocks = 0;