[Emacs-diffs] /srv/bzr/emacs/trunk r108820: * src/nsterm.m (ns_init_paths): Ignore site-lisp if --no-site-lisp.

[Glenn Morris]

------------------------------------------------------------
revno: 108820
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2012-06-30 14:35:20 -0700
message:
  * src/nsterm.m (ns_init_paths): Ignore site-lisp if --no-site-lisp.
modified:
  src/ChangeLog
  src/nsterm.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-06-30 21:10:50 +0000
+++ b/src/ChangeLog     2012-06-30 21:35:20 +0000
@@ -1,5 +1,7 @@
 2012-06-30  Glenn Morris  <address@hidden>
 
+       * 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

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2012-06-29 01:35:32 +0000
+++ b/src/nsterm.m      2012-06-30 21:35:20 +0000
@@ -320,6 +320,8 @@
                                          @"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])