Commit 504e3846 authored by Glenn Morris's avatar Glenn Morris

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.
parent fe3188b1
......@@ -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
......
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