From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Seiji Zenitani Newsgroups: gmane.emacs.devel Subject: Re: OS X: load-path on self-contained build Date: Wed, 01 Aug 2007 15:06:56 -0700 Message-ID: <627D6D1E-0114-1000-9924-137F67FF8334-Webmail-10009@mac.com> References: <1AB325EC-A475-42D9-B622-C2892A850DBB@mac.com> <6450652C-3FFD-435D-9B85-038C12AA2AE1@mac.com> <46B0FF48.9000500@ig.com.br> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1186006039 26688 80.91.229.12 (1 Aug 2007 22:07:19 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 1 Aug 2007 22:07:19 +0000 (UTC) Cc: emacs-devel@gnu.org To: Vinicius Jose Latorre Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Aug 02 00:07:12 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1IGMLU-0007Cj-ER for ged-emacs-devel@m.gmane.org; Thu, 02 Aug 2007 00:07:08 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IGMLT-0003la-Va for ged-emacs-devel@m.gmane.org; Wed, 01 Aug 2007 18:07:08 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IGMLQ-0003i5-H4 for emacs-devel@gnu.org; Wed, 01 Aug 2007 18:07:04 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IGMLO-0003bu-4i for emacs-devel@gnu.org; Wed, 01 Aug 2007 18:07:04 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IGMLN-0003bg-Sn for emacs-devel@gnu.org; Wed, 01 Aug 2007 18:07:01 -0400 Original-Received: from smtpout.mac.com ([17.250.248.181]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IGMLN-0003yt-9r for emacs-devel@gnu.org; Wed, 01 Aug 2007 18:07:01 -0400 Original-Received: from webmail019 (webmail019-s [10.13.128.19]) by smtpout.mac.com (Xserve/smtpout11/MantshX 4.0) with ESMTP id l71M6ubU005779; Wed, 1 Aug 2007 15:06:57 -0700 (PDT) in-reply-to: <46B0FF48.9000500@ig.com.br> X-Originating-IP: 128.183.134.41 Original-Received: from [128.183.134.41] from webmail.mac.com with HTTP; Wed, 01 Aug 2007 15:06:56 -0700 X-Brightmail-Tracker: AAAAAA== X-Brightmail-scanned: yes X-Detected-Kernel: FreeBSD 4.7-5.2 (or MacOS X 10.2-10.4) (1) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:75934 Archived-At: In order to avoid future misunderstanding, could you please fix the relevant comment string, too? --- mac.c.orig 2007-08-01 18:00:27.000000000 -0400 +++ mac.c 2007-08-01 18:01:53.000000000 -0400 @@ -5322,8 +5322,8 @@ /* P should have sufficient room for the pathname of the bundle plus the subpath in it leading to the respective directories. Q should have three times that much room because EMACSLOADPATH can - have the value "::". */ + have the value "::". */ p = (char *) alloca (app_bundle_pathname_len + 50); q = (char *) alloca (3 * app_bundle_pathname_len + 150); if (!getenv ("EMACSLOADPATH")) On Wednesday, August 01, 2007, at 05:45PM, "Vinicius Jose Latorre" wrote: > >Done. > >Patch applied in trunk and Emacs 22 branch. > > >Seiji Zenitani wrote: >> Hi, >> >> Could anyone please deal with the below patch? According to the CVS, >> that part was written by Dr. Andrew Choi 5 years ago (revision 1.9, >> Fri Aug 16 02:30:21 2002 UTC). I noticed that comment strings (/* ... >> */) near the relevant lines should reflect the change, too. >> >> Seiji Zenitani >> zenitani@mac.com >> >> On 2007/07/15, at 18:11, Seiji Zenitani wrote: >>> On 2007/07/10, at 18:01, Richard Stallman wrote: >>> >>>> Would someone please fix this, then ack? >>> >>> >>> The attached patch (by R. Yoshitake; GPL) works fine for me. >>> Is there any potential side-effects? >>> >>> >>> Seiji Zenitani >>> zenitani@mac.com >>> >>> >>> --- src/mac.c.orig 2007-04-20 09:26:45.000000000 -0400 >>> +++ src/mac.c 2007-06-09 18:54:42.000000000 -0400 >>> @@ -5331,12 +5335,12 @@ >>> q[0] = '\0'; >>> strcpy (p, app_bundle_pathname); >>> - strcat (p, "/Contents/Resources/lisp"); >>> + strcat (p, "/Contents/Resources/site-lisp"); >>> if (stat (p, &st) == 0 && (st.st_mode & S_IFMT) == S_IFDIR) >>> strcat (q, p); >>> strcpy (p, app_bundle_pathname); >>> - strcat (p, "/Contents/Resources/leim"); >>> + strcat (p, "/Contents/Resources/lisp"); >>> if (stat (p, &st) == 0 && (st.st_mode & S_IFMT) == S_IFDIR) >>> { >>> if (q[0] != '\0') >>> @@ -5345,7 +5349,7 @@ >>> } >>> strcpy (p, app_bundle_pathname); >>> - strcat (p, "/Contents/Resources/site-lisp"); >>> + strcat (p, "/Contents/Resources/leim"); >>> if (stat (p, &st) == 0 && (st.st_mode & S_IFMT) == S_IFDIR) >>> { >>> if (q[0] != '\0') > >