From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: David Ponce Newsgroups: gmane.emacs.devel Subject: xdisp.c minor fix. Date: Wed, 12 Mar 2003 20:50:09 +0100 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <3E6F8F71.805@wanadoo.fr> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Trace: main.gmane.org 1047498858 10940 80.91.224.249 (12 Mar 2003 19:54:18 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Wed, 12 Mar 2003 19:54:18 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Wed Mar 12 20:54:15 2003 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 18tCIp-0002q9-00 for ; Wed, 12 Mar 2003 20:54:15 +0100 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 18tCgD-0002KU-00 for ; Wed, 12 Mar 2003 21:18:25 +0100 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 18tCIq-0004ze-02 for emacs-devel@quimby.gnus.org; Wed, 12 Mar 2003 14:54:16 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10.13) id 18tCEZ-0002BD-00 for emacs-devel@gnu.org; Wed, 12 Mar 2003 14:49:51 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10.13) id 18tCC2-0000bV-00 for emacs-devel@gnu.org; Wed, 12 Mar 2003 14:47:17 -0500 Original-Received: from smtp3.wanadoo.fr ([193.252.22.27] helo=mwinf0403.wanadoo.fr) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 18tCAh-0008Ld-00 for emacs-devel@gnu.org; Wed, 12 Mar 2003 14:45:51 -0500 Original-Received: from wanadoo.fr (AGrenoble-102-1-3-102.abo.wanadoo.fr [80.13.81.102]) by mwinf0403.wanadoo.fr (Postfix) with ESMTP id 32724500034E; Wed, 12 Mar 2003 20:45:50 +0100 (CET) User-Agent: Mozilla/5.0 (Windows; U; WinNT4.0; en-US; rv:1.4a) Gecko/20030312 X-Accept-Language: en-us, en Original-To: storm@cua.dk X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: Emacs development discussions. List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:12316 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:12316 Hi Kim, With your following change, compilation of xdisp.c failed on Windows. 2003-03-12 Kim F. Storm 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