From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Benjamin Riefenstahl Newsgroups: gmane.emacs.devel Subject: Re: Status of MAC/W32/X consolidation -- first major patch committed. Date: 17 Mar 2003 15:56:01 +0100 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: References: <5xadg38lnj.fsf@kfs2.cua.dk> <5xheaaq93k.fsf@kfs2.cua.dk> <5xbs0bq8en.fsf_-_@kfs2.cua.dk> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: main.gmane.org 1047913860 7912 80.91.224.249 (17 Mar 2003 15:11:00 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Mon, 17 Mar 2003 15:11:00 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Mon Mar 17 16:00:39 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 18uw3x-0000gc-00 for ; Mon, 17 Mar 2003 15:58:05 +0100 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 18uwTe-0000Zr-00 for ; Mon, 17 Mar 2003 16:24:39 +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 18uw2h-0007K1-06 for emacs-devel@quimby.gnus.org; Mon, 17 Mar 2003 09:56:47 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10.13) id 18uw2G-0006fQ-00 for emacs-devel@gnu.org; Mon, 17 Mar 2003 09:56:20 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10.13) id 18uw1z-00062z-00 for emacs-devel@gnu.org; Mon, 17 Mar 2003 09:56:04 -0500 Original-Received: from [193.28.100.167] (helo=mail.epost.de) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 18uw1y-0005u8-00 for emacs-devel@gnu.org; Mon, 17 Mar 2003 09:56:02 -0500 Original-Received: from cicero.benny.turtle-trading.net.epost.de (193.99.153.6) by mail.epost.de (6.7.015) id 3E75CAC300001CD1; Mon, 17 Mar 2003 15:56:01 +0100 Original-To: no-spam@cua.dk (Kim F. Storm) In-Reply-To: <5xbs0bq8en.fsf_-_@kfs2.cua.dk> Original-Lines: 41 User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.2 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:12405 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:12405 Hi Kim, no-spam@cua.dk (Kim F. Storm) writes: > I have only been able to test this on X (under GNU/Linux), so there > may be some problems compiling (and running) the consolidated code on > W32 and MAC. Please report any problems to me (unless you can fix > them yourself). On MacOSX I had to do this small patch: <<<< diff -c -p -r1.811 xdisp.c *** src/xdisp.c 16 Mar 2003 20:45:46 -0000 1.811 --- src/xdisp.c 17 Mar 2003 14:31:51 -0000 *************** x_produce_glyphs (it) *** 17475,17481 **** if (font == NULL) { font = FRAME_FONT (it->f); ! boff = it->f->output_data.x->baseline_offset; font_info = NULL; } else --- 17475,17481 ---- if (font == NULL) { font = FRAME_FONT (it->f); ! boff = FRAME_BASELINE_OFFSET(it->f); font_info = NULL; } else >>>> Note that FRAME_BASELINE_OFFSET() refers to the same variable "int baseline_offset" in the different system-specific structs and the variable is always accessed through the macro. So it may properly belong into the common data structure struct frame instead anyway. so long, benny