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

2e4c5312 · Glenn Morris · bbce2853 · 2e4c5312 · 2e4c5312
Commit 2e4c5312 authored Jun 30, 2012 by Glenn Morris
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

src/ChangeLog src/ChangeLog +2 -0

src/nsterm.m src/nsterm.m +2 -0

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
 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

--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -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])