Mercurial > emacs
changeset 59332:15087a4cee39
(x_new_font): Set FRAME_COLUMN_WIDTH to fontp->average_width,
not FONT_WIDTH. Set FRAME_SPACE_WIDTH to fontp->space_width.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Mon, 03 Jan 2005 22:52:51 +0000 |
| parents | 35ab85a2d8f2 |
| children | f23a47fb1568 |
| files | src/w32term.c |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/w32term.c Mon Jan 03 22:52:01 2005 +0000 +++ b/src/w32term.c Mon Jan 03 22:52:51 2005 +0000 @@ -819,8 +819,7 @@ /* 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 @@ } -static XCharStruct * +XCharStruct * w32_per_char_metric (font, char2b, font_type) XFontStruct *font; wchar_t *char2b; @@ -5290,7 +5289,8 @@ 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);