diff options
| author | Anders Lindgren | 2015-12-09 06:35:12 +0100 |
|---|---|---|
| committer | Anders Lindgren | 2015-12-09 06:35:12 +0100 |
| commit | ae3057412a0673667e76cd281e5c5db46be18254 (patch) | |
| tree | 20418b7621dcac1e00ee7bf884fb63bbe8474e81 /src | |
| parent | a1ad5311683dc84bf2cb023ea7d3043084452cc3 (diff) | |
| download | emacs-ae3057412a0673667e76cd281e5c5db46be18254.tar.gz emacs-ae3057412a0673667e76cd281e5c5db46be18254.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lread.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lread.c b/src/lread.c index 0da5819d343..74a5fdfe67b 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -4353,7 +4353,7 @@ init_lread (void) | |||
| 4353 | load_path_check (default_lpath); | 4353 | load_path_check (default_lpath); |
| 4354 | 4354 | ||
| 4355 | /* Add the site-lisp directories to the front of the default. */ | 4355 | /* Add the site-lisp directories to the front of the default. */ |
| 4356 | if (!no_site_lisp) | 4356 | if (!no_site_lisp && PATH_SITELOADSEARCH[0] != '\0') |
| 4357 | { | 4357 | { |
| 4358 | Lisp_Object sitelisp; | 4358 | Lisp_Object sitelisp; |
| 4359 | sitelisp = decode_env_path (0, PATH_SITELOADSEARCH, 0); | 4359 | sitelisp = decode_env_path (0, PATH_SITELOADSEARCH, 0); |
| @@ -4384,7 +4384,7 @@ init_lread (void) | |||
| 4384 | load_path_check (Vload_path); | 4384 | load_path_check (Vload_path); |
| 4385 | 4385 | ||
| 4386 | /* Add the site-lisp directories at the front. */ | 4386 | /* Add the site-lisp directories at the front. */ |
| 4387 | if (initialized && !no_site_lisp) | 4387 | if (initialized && !no_site_lisp && PATH_SITELOADSEARCH[0] != '\0') |
| 4388 | { | 4388 | { |
| 4389 | Lisp_Object sitelisp; | 4389 | Lisp_Object sitelisp; |
| 4390 | sitelisp = decode_env_path (0, PATH_SITELOADSEARCH, 0); | 4390 | sitelisp = decode_env_path (0, PATH_SITELOADSEARCH, 0); |