From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Austin Frank Newsgroups: gmane.emacs.bugs,gmane.emacs.pretest.bugs Subject: bug#831: 23.0.60; error in nsfonts.m Date: Sat, 30 Aug 2008 13:32:39 -0400 Message-ID: Reply-To: Austin Frank , 831@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" X-Trace: ger.gmane.org 1220124509 2492 80.91.229.12 (30 Aug 2008 19:28:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 30 Aug 2008 19:28:29 +0000 (UTC) To: emacs-pretest-bug@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Aug 30 21:29:23 2008 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1KZW88-0000pp-3m for geb-bug-gnu-emacs@m.gmane.org; Sat, 30 Aug 2008 21:29:04 +0200 Original-Received: from localhost ([127.0.0.1]:45590 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KZW79-0001qa-8v for geb-bug-gnu-emacs@m.gmane.org; Sat, 30 Aug 2008 15:28:03 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KZUYF-0007dl-VW for bug-gnu-emacs@gnu.org; Sat, 30 Aug 2008 13:47:56 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KZUY7-0007Xz-Tb for bug-gnu-emacs@gnu.org; Sat, 30 Aug 2008 13:47:55 -0400 Original-Received: from [199.232.76.173] (port=35988 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KZUY7-0007Xv-Hw for bug-gnu-emacs@gnu.org; Sat, 30 Aug 2008 13:47:47 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:60056) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KZUY3-0002u5-4Q for bug-gnu-emacs@gnu.org; Sat, 30 Aug 2008 13:47:47 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m7UHlTOK007398; Sat, 30 Aug 2008 10:47:30 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id m7UHe4vr004533; Sat, 30 Aug 2008 10:40:04 -0700 X-Loop: don@donarmstrong.com Resent-From: Austin Frank Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Sat, 30 Aug 2008 17:40:04 +0000 Resent-Message-ID: Resent-Sender: don@donarmstrong.com X-Emacs-PR-Message: report 831 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by submit@emacsbugs.donarmstrong.com id=B.12201175652502 (code B ref -1); Sat, 30 Aug 2008 17:40:04 +0000 Original-Received: (at submit) by emacsbugs.donarmstrong.com; 30 Aug 2008 17:32:45 +0000 Original-Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m7UHWfNY002496 for ; Sat, 30 Aug 2008 10:32:42 -0700 Original-Received: from mx10.gnu.org ([199.232.76.166]:58230) by fencepost.gnu.org with esmtp (Exim 4.67) (envelope-from ) id 1KZUHz-0001tx-O7 for emacs-pretest-bug@gnu.org; Sat, 30 Aug 2008 13:31:07 -0400 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1KZUJR-0006qM-9O for emacs-pretest-bug@gnu.org; Sat, 30 Aug 2008 13:32:40 -0400 Original-Received: from yx-out-1718.google.com ([74.125.44.152]:44191) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KZUJQ-0006ps-Ti for emacs-pretest-bug@gnu.org; Sat, 30 Aug 2008 13:32:37 -0400 Original-Received: by yx-out-1718.google.com with SMTP id 34so683563yxf.66 for ; Sat, 30 Aug 2008 10:32:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:subject:date :message-id:user-agent:mime-version:content-type; bh=ADgl4AybtEe+nyIY537k91mpvu1wHJ76SJy4X8tm/8k=; b=jqhmAYNNVJXP+A+LBnNw/TSz7lmZbpQtxFkNo/G7/9qHBTFyJ73YTbRoIIeZRhIWU3 O+/BM4qszQ1Vxeql3hRQqiGz4cBW0WjfjF1DUCtx4BGoUCZIhHLGBPUFyam6qfCiZdo5 ivntpsnopnXuYW/nyUk/3g/InI+CJqwRUfE04= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:message-id:user-agent:mime-version :content-type; b=WZtuy3DqfS7ol+Q5sqUyR8veJqdi2FR0biPugh3u36x/bMR8Er00T3M0jZrusvO7x9 prtRC836NHEZC65/cHOJS0dR44x3fCWKVAcoPryhYy9hb0DhRLlCiS1s1edmN9fnVZyQ SM4w5zxHnsNkREtYeQfNda5kyHoJq8DzMPv3k= Original-Received: by 10.151.111.15 with SMTP id o15mr6104192ybm.93.1220117554625; Sat, 30 Aug 2008 10:32:34 -0700 (PDT) Original-Received: from localhost ( [74.69.93.157]) by mx.google.com with ESMTPS id 7sm4344277ywo.7.2008.08.30.10.32.33 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 30 Aug 2008 10:32:33 -0700 (PDT) User-Agent: Gnus/5.110011 (No Gnus v0.11) Emacs/23.0.60 (darwin) X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 2) X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) Resent-Date: Sat, 30 Aug 2008 13:47:55 -0400 X-Mailman-Approved-At: Sat, 30 Aug 2008 15:28:00 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:19915 gmane.emacs.pretest.bugs:22907 Archived-At: --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= I'm trying to build emacs from a current CVS checkout on OSX 10.4.11 with the configure option --with-ns. Build fails because of error in nsfonts.m. That file references a variable called gidx, which is not defined in the relevant structure. The attached patch changes all instances of gidx to x, and allows emacs to build on my system. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=gidx.patch Content-Transfer-Encoding: quoted-printable diff --git a/src/nsfont.m b/src/nsfont.m index f49cd0f..10b1c90 100644 =2D-- a/src/nsfont.m +++ b/src/nsfont.m @@ -904,14 +904,14 @@ nsfont_draw (struct glyph_string *s, int from, int to= , int x, int y, int hi, lo; char isComposite =3D 0; /* s->first_glyph->type =3D=3D COMPOSITE_GLYPH= ; */ /* FIXME: composition: no vertical displacement is considered. */ =2D t+=3D s->gidx; /* advance into composition */ =2D for (i =3D0; inchars - s->gidx; i++, t++) + t+=3D s->x; /* advance into composition */ + for (i =3D0; inchars - s->x; i++, t++) { hi =3D (*t & 0xFF00) >> 8; lo =3D *t & 0x00FF; if (isComposite) { =2D cwidth =3D s->cmp->offsets[s->gidx++ * 2] - twidth; + cwidth =3D s->cmp->offsets[s->x++ * 2] - twidth; } else { @@ -1094,13 +1094,13 @@ nsfont_draw (struct glyph_string *s, int from, int = to, int x, int y, [col set]; =20 CGContextSetTextPosition (gcontext, r.origin.x, r.origin.y); =2D CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->gidx, + CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->x, advances, len); =20 if (face->overstrike) { CGContextSetTextPosition (gcontext, r.origin.x+0.5, r.origin.y); =2D CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->gidx, + CGContextShowGlyphsWithAdvances (gcontext, s->char2b + s->x, advances, len); } =20 --=-=-= Content-Transfer-Encoding: quoted-printable In GNU Emacs 23.0.60.1 (powerpc-apple-darwin8.11.0, X toolkit) of 2008-08-29 on malibu.local Important settings: value of $LC_ALL: en_US.UTF-8 value of $LC_COLLATE: nil value of $LC_CTYPE: en_US.UTF-8 value of $LC_MESSAGES: nil value of $LC_MONETARY: nil value of $LC_NUMERIC: nil value of $LC_TIME: nil value of $LANG: nil value of $XMODIFIERS: nil locale-coding-system: utf-8-unix default-enable-multibyte-characters: t =2D-=20 Austin Frank http://aufrank.net GPG Public Key (D7398C2F): http://aufrank.net/personal.asc --=-=-=-- --==-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (Darwin) iEYEARECAAYFAki5hDgACgkQlHMl2/XbR4Gd2wCfVHK7wfQAv5do6+B7hsKoZJwR kTwAoLxR0MDYoUOD/iF25lh2t2n4/5F3 =xw6u -----END PGP SIGNATURE----- --==-=-=--