diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2021-11-20 18:17:59 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2021-11-20 18:17:59 +0200 |
| commit | 7e437af41319330ddade02d9784cf78c8e6674d8 (patch) | |
| tree | 5cfc6d6aa29c55ef3c32e5a10c8c289f2b71053a /src | |
| parent | 0fbfd4253ece9e5271509454cd2bbab5359e4b67 (diff) | |
Fix temacs invocation from outside of the 'src' directory
* src/emacs.c (main) [HAVE_NATIVE_COMP]: Recompute the value of
native-comp-eln-load-path if about to load loadup in uninitialized
Emacs. (Bug#51999)
Diffstat (limited to 'src')
| -rw-r--r-- | src/emacs.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/emacs.c b/src/emacs.c index 866e43fda94..41c92a46155 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -2284,6 +2284,17 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem /* Unless next switch is -nl, load "loadup.el" first thing. */ if (! no_loadup) Vtop_level = list2 (Qload, build_string ("loadup.el")); + +#ifdef HAVE_NATIVE_COMP + /* If we are going to load stuff in a non-initialized Emacs, + update the value of native-comp-eln-load-path, so that the + *.eln files will be found if they are there. */ + if (!NILP (Vtop_level) && !temacs) + Vnative_comp_eln_load_path = + Fcons (Fexpand_file_name (XCAR (Vnative_comp_eln_load_path), + Vinvocation_directory), + Qnil); +#endif } /* Set up for profiling. This is known to work on FreeBSD, |