[patch] Non-X build problems

[patch] Non-X build problems

[Anders Johannsen]

This patch solves a problem with determining the font width in a platform
independent manner, causing a build from cvs on a non-X platform to fail.

The fix should be straight-forward: use the FRAME_FONT() macro. This is,
however, my first dive into the emacs source code.

Thanks,

Anders Johannsen


ajoh@stake% cvs diff -c xdisp.c
Index: xdisp.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xdisp.c,v
retrieving revision 1.809
diff -c -r1.809 xdisp.c
*** xdisp.c     12 Mar 2003 12:11:00 -0000      1.809
--- xdisp.c     12 Mar 2003 22:18:50 -0000
***************
*** 8352,8358 ****
        int left_wid = left_fringe_width >= 0 ? left_fringe_width :
-left_fringe_width;
        int right_wid = right_fringe_width >= 0 ? right_fringe_width :
-right_fringe_width;
        int conf_wid = left_wid + right_wid;
!       int font_wid = FONT_WIDTH (f->output_data.x->font);
        int cols = (left_wid + right_wid + font_wid-1) / font_wid;
        int real_wid = cols * font_wid;
        if (left_wid && right_wid)
--- 8352,8358 ----
        int left_wid = left_fringe_width >= 0 ? left_fringe_width :
-left_fringe_width;
        int right_wid = right_fringe_width >= 0 ? right_fringe_width :
-right_fringe_width;
        int conf_wid = left_wid + right_wid;
!       int font_wid = FONT_WIDTH (FRAME_FONT (f));
        int cols = (left_wid + right_wid + font_wid-1) / font_wid;
        int real_wid = cols * font_wid;
        if (left_wid && right_wid)