diff options
| author | Glenn Morris <rgm@gnu.org> | 2016-12-19 13:32:55 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2016-12-19 13:32:55 -0500 |
| commit | 504e3846041e4fcd1707a9ad6176ddaf3fec3d02 (patch) | |
| tree | 2fc622abf875a785f0f6376ce0dbebe625ed4051 /src/lread.c | |
| parent | fe3188b1cecc7ac5534616c8edf14a84b1b3bbb0 (diff) | |
| download | emacs-504e3846041e4fcd1707a9ad6176ddaf3fec3d02.tar.gz | |
Improve default load-path for uninstalled CANNOT_DUMP builds
* src/lread.c (load_path_default) [CANNOT_DUMP]:
Use build load-path if we seem to be running uninstalled. (Bug#24974)
I think this became an issue several years ago when we stopped
using EMACSLOADPATH in the Makefiles; however this change should
improve the CANNOT_DUMP uninstalled case in general.
Diffstat (limited to 'src/lread.c')
| -rw-r--r-- | src/lread.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lread.c b/src/lread.c index 157a392a158..fdbf0329118 100644 --- a/src/lread.c +++ b/src/lread.c @@ -4271,7 +4271,9 @@ load_path_check (Lisp_Object lpath) are running uninstalled. Uses the following logic: - If CANNOT_DUMP: Use PATH_LOADSEARCH. + If CANNOT_DUMP: + If Vinstallation_directory is not nil (ie, running uninstalled), + use PATH_DUMPLOADSEARCH (ie, build path). Else use PATH_LOADSEARCH. The remainder is what happens when dumping works: If purify-flag (ie dumping) just use PATH_DUMPLOADSEARCH. Otherwise use PATH_LOADSEARCH. @@ -4305,6 +4307,8 @@ load_path_default (void) #endif normal = PATH_LOADSEARCH; + if (!NILP (Vinstallation_directory)) normal = PATH_DUMPLOADSEARCH; + #ifdef HAVE_NS lpath = decode_env_path (0, loadpath ? loadpath : normal, 0); #else |