emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

xdisp.c minor fix.


From: David Ponce
Subject: xdisp.c minor fix.
Date: Wed, 12 Mar 2003 20:50:09 +0100
User-agent: Mozilla/5.0 (Windows; U; WinNT4.0; en-US; rv:1.4a) Gecko/20030312

Hi Kim,

With your following change, compilation of xdisp.c failed on Windows.

2003-03-12  Kim F. Storm  <address@hidden>

        The following changes consolidates the fringe handling from
        xterm.c, w32term.c, and macterm.c into xdisp.c.

        * xdisp.c: Consolidate fringe handling code here.
        (left_bits, right_bits, continued_bits, continuation_bits)
        (ov_bits, zv_bits): Define fringe bitmaps.
        (fringe_bitmaps): New array holding fringe bitmaps.
        (draw_fringe_bitmap): Draw a specific bitmap; call display
        specific drawing routine via rif->draw_fringe_bitmap.
        (draw_row_fringe_bitmaps): Generic replacement for
        x_draw_row_fringe_bitmaps; all callers changed.
        (compute_fringe_widths): Generic replacement for
        x_compute_fringe_widths; all callers changed.

I applied this patch that solved the problem:

Index: src/xdisp.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xdisp.c,v
retrieving revision 1.809
diff -c -r1.809 xdisp.c
*** src/xdisp.c 12 Mar 2003 12:11:00 -0000      1.809
--- src/xdisp.c 12 Mar 2003 19:34:30 -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)


Hope it helps.
David






reply via email to

[Prev in Thread] Current Thread [Next in Thread]