Re: OS X: load-path on self-contained build

[Vinicius Jose Latorre]

Done.

Patch applied in trunk and Emacs 22 branch.


Seiji Zenitani wrote:
> 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 "<path to lisp dir>:<path to leim dir>:<path to
> -     site-lisp dir>".  */
> +     have the value "<path to site-lisp dir>:<path to lisp dir>:<path
> +     to leim dir>".  */
>    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" 
> <address@hidden> 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
> > > address@hidden
> > >
> > > 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
> > > > address@hidden
> > > >
> > > >
> > > > --- 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')
> > > >