[Emacs-diffs] Changes to emacs/src/w32term.c

[Jason Rumney]

Index: emacs/src/w32term.c
diff -c emacs/src/w32term.c:1.220 emacs/src/w32term.c:1.221
*** emacs/src/w32term.c:1.220   Sat Dec 11 21:12:45 2004
--- emacs/src/w32term.c Mon Jan  3 22:52:51 2005
***************
*** 819,826 ****
  
  /* Function prototypes of this page.  */
  
! static XCharStruct *w32_per_char_metric P_ ((XFontStruct *,
!                                              wchar_t *, int));
  static int w32_encode_char P_ ((int, wchar_t *, struct font_info *, int *));
  
  
--- 819,825 ----
  
  /* Function prototypes of this page.  */
  
! XCharStruct *w32_per_char_metric P_ ((XFontStruct *, wchar_t *, int));
  static int w32_encode_char P_ ((int, wchar_t *, struct font_info *, int *));
  
  
***************
*** 957,963 ****
  }
  
  
! static XCharStruct *
  w32_per_char_metric (font, char2b, font_type)
       XFontStruct *font;
       wchar_t *char2b;
--- 956,962 ----
  }
  
  
! XCharStruct *
  w32_per_char_metric (font, char2b, font_type)
       XFontStruct *font;
       wchar_t *char2b;
***************
*** 5290,5296 ****
    FRAME_BASELINE_OFFSET (f) = fontp->baseline_offset;
    FRAME_FONTSET (f) = -1;
  
!   FRAME_COLUMN_WIDTH (f) = FONT_WIDTH (FRAME_FONT (f));
    FRAME_LINE_HEIGHT (f) = FONT_HEIGHT (FRAME_FONT (f));
  
    compute_fringe_widths (f, 1);
--- 5289,5296 ----
    FRAME_BASELINE_OFFSET (f) = fontp->baseline_offset;
    FRAME_FONTSET (f) = -1;
  
!   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);