Mercurial > emacs
changeset 55139:2b5be9da52c2
lread.c (init_lread): Don't display missing lisp directory
warnings with Carbon Emacs because self-contained bundled Emacs
may be build without correct installation path.
| author | Steven Tamm <steventamm@mac.com> |
|---|---|
| date | Sun, 25 Apr 2004 21:07:58 +0000 |
| parents | 5d9c0626b44c |
| children | 98453142b576 |
| files | src/ChangeLog src/lread.c |
| diffstat | 2 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Apr 25 20:58:26 2004 +0000 +++ b/src/ChangeLog Sun Apr 25 21:07:58 2004 +0000 @@ -1,3 +1,8 @@ +2004-04-26 Steven Tamm <steventamm@mac.com> + * lread.c (init_lread): Don't display missing lisp directory + warnings with Carbon Emacs because self-contained bundled Emacs + may be build without correct installation path. + 2004-04-25 Kim F. Storm <storm@cua.dk> * macterm.c (x_draw_hollow_cursor): Fix height of box for narrow lines.
--- a/src/lread.c Sun Apr 25 20:58:26 2004 +0000 +++ b/src/lread.c Sun Apr 25 21:07:58 2004 +0000 @@ -3676,11 +3676,15 @@ } #endif -#ifndef WINDOWSNT +#if (!(defined(WINDOWSNT) && (defined(HAVE_CARBON)) )) /* When Emacs is invoked over network shares on NT, PATH_LOADSEARCH is almost never correct, thereby causing a warning to be printed out that confuses users. Since PATH_LOADSEARCH is always overridden by the - EMACSLOADPATH environment variable below, disable the warning on NT. */ + EMACSLOADPATH environment variable below, disable the warning on NT. + Also, when using the "self-contained" option for Carbon Emacs for MacOSX, + the "standard" paths may not exist and would be overridden by + EMACSLOADPATH as on NT. Since this depends on how the executable + was build and packaged, turn off the warnings in general */ /* Warn if dirs in the *standard* path don't exist. */ if (!turn_off_warning) @@ -3702,7 +3706,7 @@ } } } -#endif /* WINDOWSNT */ +#endif /* WINDOWSNT && HAVE_CARBON*/ /* If the EMACSLOADPATH environment variable is set, use its value. This doesn't apply if we're dumping. */