From 2e4c5312874c730f2088b8a189cc3c943ff47c5c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 30 Jun 2012 14:35:20 -0700 Subject: [PATCH] * src/nsterm.m (ns_init_paths): Ignore site-lisp if --no-site-lisp. --- src/ChangeLog | 2 ++ src/nsterm.m | 2 ++ 2 files changed, 4 insertions(+) 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 + * 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]) -- 2.39.2