* src/nsterm.m (ns_init_paths): Ignore site-lisp if --no-site-lisp.

This commit is contained in:
Glenn Morris 2012-06-30 14:35:20 -07:00
parent bbce28533b
commit 2e4c531287
2 changed files with 4 additions and 0 deletions

View file

@ -1,5 +1,7 @@
2012-06-30 Glenn Morris <rgm@gnu.org>
* nsterm.m (ns_init_paths): Ignore site-lisp if --no-site-lisp.
* epaths.in (PATH_SITELOADSEARCH): New.
* lread.c (init_lread): Use PATH_SITELOADSEARCH.
This is rather than relying on --enable-locallisppath elements

View file

@ -320,6 +320,8 @@ Updated by Christian Limpach (chris@nice.ch)
@"site-lisp", @"lisp", @"leim", nil]];
NSEnumerator *pathEnum = [paths objectEnumerator];
resourcePaths = @"";
/* Hack to skip site-lisp. */
if (no_site_lisp) resourcePath = [pathEnum nextObject];
while (resourcePath = [pathEnum nextObject])
{
if ([fileManager fileExistsAtPath: resourcePath isDirectory: &isDir])