Mercurial > emacs
diff src/lread.c @ 96675:d45acf0c8d23
merging Emacs.app (NeXTstep port)
author | Adrian Robert <Adrian.B.Robert@gmail.com> |
---|---|
date | Tue, 15 Jul 2008 18:15:18 +0000 |
parents | c3309dba6542 |
children | 9592c50233ab |
line wrap: on
line diff
--- a/src/lread.c Tue Jul 15 15:45:05 2008 +0000 +++ b/src/lread.c Tue Jul 15 18:15:18 2008 +0000 @@ -4095,7 +4095,7 @@ } #endif -#if (!(defined(WINDOWSNT) || (defined(HAVE_CARBON)))) +#if (!(defined(WINDOWSNT) || (defined(HAVE_CARBON)) || (defined(HAVE_NS)))) /* 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 @@ -4125,7 +4125,7 @@ } } } -#endif /* !(WINDOWSNT || HAVE_CARBON) */ +#endif /* !(WINDOWSNT || HAVE_CARBON || HAVE_NS) */ /* If the EMACSLOADPATH environment variable is set, use its value. This doesn't apply if we're dumping. */