From: Glenn Morris <rgm@gnu.org>
Date: Sat, 30 Jun 2012 21:35:20 +0000 (-0700)
Subject: * src/nsterm.m (ns_init_paths): Ignore site-lisp if --no-site-lisp.
X-Git-Tag: emacs-24.2.90~1199^2~267
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2e4c5312874c730f2088b8a189cc3c943ff47c5c;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 2391a9b7022..4f196c4bec1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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
diff --git a/src/nsterm.m b/src/nsterm.m
index c75b17135ef..431577c4f01 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -320,6 +320,8 @@ ns_init_paths (void)
                                          @"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])