# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1104799442 0
# Node ID 4dcf8118d497c803ece9e816b34a5e7ac13bb4c2
# Parent  123d350f0883ba3f9f9c85e8209e1c4720290f08
*** empty log message ***

diff -r 123d350f0883 -r 4dcf8118d497 src/ChangeLog
--- a/src/ChangeLog	Tue Jan 04 00:09:21 2005 +0000
+++ b/src/ChangeLog	Tue Jan 04 00:44:02 2005 +0000
@@ -1,3 +1,16 @@
+2005-01-03  Jason Rumney  <jasonr@gnu.org>
+
+	* w32bdf.c (w32_load_bdf_font): Set fontp->average_width and
+	fontp->space_width to FONT_WIDTH so they are valid.
+
+	* w32fns.c (w32_load_system_font): Set FONT_WIDTH to maximum, not
+	average width. Set fontp->average_width and fontp->space_width to
+	their appropriate values.
+
+	* w32term.c (x_new_font): Set FRAME_COLUMN_WIDTH to
+	fontp->average_width, not FONT_WIDTH.  Set FRAME_SPACE_WIDTH to
+	fontp->space_width.
+
 2005-01-03  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* macterm.c (x_new_font): Set FRAME_SPACE_WIDTH.
@@ -59,7 +72,7 @@
 
 	* xterm.c (x_new_font): Set FRAME_COLUMN_WIDTH to
 	fontp->average_width, not FONT_WIDTH.  Set FRAME_SPACE_WIDTH to
-	fontp-?space_width..
+	fontp->space_width.
 	(x_load_font): Calculate fontp->space_width and
 	fontp->average_width.
 	(x_term_init): Initialize dpyinfo->Xatom_AVERAGE_WIDTH.