procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix temacs invocation from outside of the 'src' directory

Browse source 
* 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)
This commit is contained in:
Eli Zaretskii 2021-11-20 18:17:59 +02:00
parent 0fbfd4253e
commit 7e437af413
1 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/emacs.c
View file

@ -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. */ /* Unless next switch is -nl, load "loadup.el" first thing. */
if (! no_loadup) if (! no_loadup)
Vtop_level = list2 (Qload, build_string ("loadup.el")); 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, /* Set up for profiling. This is known to work on FreeBSD,