Commit ae305741 authored by Anders Lindgren's avatar Anders Lindgren

Don't add "." to load path (bug#21104)

When configured with --enable-locallisppath=no, which is the
default for OS X, the load-path incorrectly was populated with ".".

* src/lread.c (init_lread): Don't call `decode_env_path' when
PATH_SITELOADSEARCH is empty.
parent a1ad5311
......@@ -4353,7 +4353,7 @@ init_lread (void)
load_path_check (default_lpath);
/* Add the site-lisp directories to the front of the default. */
if (!no_site_lisp)
if (!no_site_lisp && PATH_SITELOADSEARCH[0] != '\0')
{
Lisp_Object sitelisp;
sitelisp = decode_env_path (0, PATH_SITELOADSEARCH, 0);
......@@ -4384,7 +4384,7 @@ init_lread (void)
load_path_check (Vload_path);
/* Add the site-lisp directories at the front. */
if (initialized && !no_site_lisp)
if (initialized && !no_site_lisp && PATH_SITELOADSEARCH[0] != '\0')
{
Lisp_Object sitelisp;
sitelisp = decode_env_path (0, PATH_SITELOADSEARCH, 0);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment