[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 ae30574: Don't add "." to load path (bug#21104)
From: |
Anders Lindgren |
Subject: |
[Emacs-diffs] emacs-25 ae30574: Don't add "." to load path (bug#21104) |
Date: |
Wed, 09 Dec 2015 05:35:58 +0000 |
branch: emacs-25
commit ae3057412a0673667e76cd281e5c5db46be18254
Author: Anders Lindgren <address@hidden>
Commit: Anders Lindgren <address@hidden>
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.
---
src/lread.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lread.c b/src/lread.c
index 0da5819..74a5fdf 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 ae30574: Don't add "." to load path (bug#21104),
Anders Lindgren <=