From: Jason Rumney <jasonr@gnu.org>
Date: Mon, 3 Jan 2005 22:52:01 +0000 (+0000)
Subject: (w32_load_bdf_font): Set fontp->average_width and
X-Git-Tag: ttn-vms-21-2-B4~2945
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a4d75ad7ceda7ed78eb6143b075e812a2ebb5eb1;p=emacs.git

(w32_load_bdf_font): Set fontp->average_width and
fontp->space_width to FONT_WIDTH so they are valid.
---

diff --git a/src/w32bdf.c b/src/w32bdf.c
index 04739b8e846..092aff306dc 100644
--- a/src/w32bdf.c
+++ b/src/w32bdf.c
@@ -774,7 +774,10 @@ struct font_info *w32_load_bdf_font (struct frame *f, char *fontname,
   fontp->name = (char *) xmalloc (strlen (fontname) + 1);
   bcopy (fontname, fontp->name, strlen (fontname) + 1);
   fontp->full_name = fontp->name;
-  fontp->size = FONT_WIDTH (font);
+  /* FIXME: look at BDF spec to see if there are better ways of finding
+     average_width and space_width, hopefully that don't involve working out
+     the values for ourselves from the data.  */
+  fontp->size = fontp->average_width = fontp->space_width = FONT_WIDTH (font);
   fontp->height = FONT_HEIGHT (font);
 
     /* The slot `encoding' specifies how to map a character