Commit 3aefd49f authored by Jason Rumney's avatar Jason Rumney

(x_new_font): Set FRAME_COLUMN_WIDTH to fontp->average_width,

not FONT_WIDTH.  Set FRAME_SPACE_WIDTH to fontp->space_width.
parent a4d75ad7
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment