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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 56093ed72d3c009c9baff532d65ed492703c926e..b0c6840923423247695442d44de52f09ec925a15 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.

diff --git a/src/lread.c b/src/lread.c
index 4aa49c59eef778d2af0fff27347598417dbd08fd..66ac69912b77f35f1489c0fcb7974d6f6c1a10f9 100644 (file)
--- 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.  */