From f3d5f92d98cb97a735ae9725a7db8479b5d81d85 Mon Sep 17 00:00:00 2001 From: Steven Tamm Date: Sun, 25 Apr 2004 21:07:58 +0000 Subject: [PATCH] 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. --- src/ChangeLog | 5 +++++ src/lread.c | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 56093ed72d3..b0c68409234 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2004-04-26 Steven Tamm + * 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 * macterm.c (x_draw_hollow_cursor): Fix height of box for narrow lines. diff --git a/src/lread.c b/src/lread.c index 4aa49c59eef..66ac69912b7 100644 --- a/src/lread.c +++ b/src/lread.c @@ -3676,11 +3676,15 @@ init_lread () } #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 @@ init_lread () } } } -#endif /* WINDOWSNT */ +#endif /* WINDOWSNT && HAVE_CARBON*/ /* If the EMACSLOADPATH environment variable is set, use its value. This doesn't apply if we're dumping. */ -- 2.39.5