aboutsummaryrefslogtreecommitdiffstats
path: root/src/lread.c
diff options
context:
space:
mode:
authorAdrian Robert2008-07-15 18:15:18 +0000
committerAdrian Robert2008-07-15 18:15:18 +0000
commitedfda78355c5528eee489fa8a7f9c73bf8e734f2 (patch)
tree78d2414d9791e1efc17ec9b35b438ae35602340a /src/lread.c
parent1391cd548782097e34d7856ec4f20ca90bdf2c26 (diff)
downloademacs-edfda78355c5528eee489fa8a7f9c73bf8e734f2.tar.gz
emacs-edfda78355c5528eee489fa8a7f9c73bf8e734f2.zip
merging Emacs.app (NeXTstep port)
Diffstat (limited to 'src/lread.c')
-rw-r--r--src/lread.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lread.c b/src/lread.c
index 6415448c0bc..6ec8dff6cfd 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4095,7 +4095,7 @@ init_lread ()
4095 } 4095 }
4096#endif 4096#endif
4097 4097
4098#if (!(defined(WINDOWSNT) || (defined(HAVE_CARBON)))) 4098#if (!(defined(WINDOWSNT) || (defined(HAVE_CARBON)) || (defined(HAVE_NS))))
4099 /* When Emacs is invoked over network shares on NT, PATH_LOADSEARCH is 4099 /* When Emacs is invoked over network shares on NT, PATH_LOADSEARCH is
4100 almost never correct, thereby causing a warning to be printed out that 4100 almost never correct, thereby causing a warning to be printed out that
4101 confuses users. Since PATH_LOADSEARCH is always overridden by the 4101 confuses users. Since PATH_LOADSEARCH is always overridden by the
@@ -4125,7 +4125,7 @@ init_lread ()
4125 } 4125 }
4126 } 4126 }
4127 } 4127 }
4128#endif /* !(WINDOWSNT || HAVE_CARBON) */ 4128#endif /* !(WINDOWSNT || HAVE_CARBON || HAVE_NS) */
4129 4129
4130 /* If the EMACSLOADPATH environment variable is set, use its value. 4130 /* If the EMACSLOADPATH environment variable is set, use its value.
4131 This doesn't apply if we're dumping. */ 4131 This doesn't apply if we're dumping. */