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

(x_new_font): Set FRAME_COLUMN_WIDTH to fontp->average_width,
not FONT_WIDTH.  Set FRAME_SPACE_WIDTH to fontp->space_width.
---

diff --git a/src/w32term.c b/src/w32term.c
index 6e17b22ec5b..a0b00d58659 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -819,8 +819,7 @@ w32_reset_terminal_modes (void)
 
 /* Function prototypes of this page.  */
 
-static XCharStruct *w32_per_char_metric P_ ((XFontStruct *,
-                                             wchar_t *, int));
+XCharStruct *w32_per_char_metric P_ ((XFontStruct *, wchar_t *, int));
 static int w32_encode_char P_ ((int, wchar_t *, struct font_info *, int *));
 
 
@@ -957,7 +956,7 @@ w32_native_per_char_metric (font, char2b, font_type, pcm)
 }
 
 
-static XCharStruct *
+XCharStruct *
 w32_per_char_metric (font, char2b, font_type)
      XFontStruct *font;
      wchar_t *char2b;
@@ -5290,7 +5289,8 @@ x_new_font (f, fontname)
   FRAME_BASELINE_OFFSET (f) = fontp->baseline_offset;
   FRAME_FONTSET (f) = -1;
 
-  FRAME_COLUMN_WIDTH (f) = FONT_WIDTH (FRAME_FONT (f));
+  FRAME_COLUMN_WIDTH (f) = fontp->average_width;
+  FRAME_SPACE_WIDTH (f) = fontp->space_width;
   FRAME_LINE_HEIGHT (f) = FONT_HEIGHT (FRAME_FONT (f));
 
   compute_fringe_widths (f, 1);