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

[Juanma Barranquero]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      08/05/27 08:55:21

Index: w32font.c
===================================================================
RCS file: /sources/emacs/emacs/src/w32font.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- w32font.c   27 May 2008 08:29:41 -0000      1.30
+++ w32font.c   27 May 2008 08:55:21 -0000      1.31
@@ -958,7 +958,7 @@
 
   /* Foundry is difficult to get in readable form on Windows.
      But Emacs crashes if it is not set, so set it to something more
-     generic.  These values make xflds compatible with Emacs 22. */
+     generic.  These values make xlfds compatible with Emacs 22. */
   if (lf->lfOutPrecision == OUT_STRING_PRECIS)
     tem = Qraster;
   else if (lf->lfOutPrecision == OUT_STROKE_PRECIS)
@@ -1851,7 +1851,8 @@
 }
 
 
-static void compute_metrics (dc, w32_font, code, metrics)
+static void
+compute_metrics (dc, w32_font, code, metrics)
      HDC dc;
      struct w32font_info *w32_font;
      unsigned int code;
@@ -1876,9 +1877,7 @@
       metrics->width = gm.gmCellIncX;
       metrics->status = W32METRIC_SUCCESS;
     }
-  else
-    {
-      if (w32_font->glyph_idx)
+  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
@@ -1888,7 +1887,6 @@
        }
       else
         metrics->status = W32METRIC_FAIL;
-    }
 }
 
 static void