[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-28 7e437af: Fix temacs invocation from outside of the 'src' direct
From: |
Eli Zaretskii |
Subject: |
emacs-28 7e437af: Fix temacs invocation from outside of the 'src' directory |
Date: |
Sat, 20 Nov 2021 11:18:21 -0500 (EST) |
branch: emacs-28
commit 7e437af41319330ddade02d9784cf78c8e6674d8
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
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)
---
src/emacs.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/emacs.c b/src/emacs.c
index 866e43f..41c92a4 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,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-28 7e437af: Fix temacs invocation from outside of the 'src' directory,
Eli Zaretskii <=