]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix temacs invocation from outside of the 'src' directory
authorEli Zaretskii <eliz@gnu.org>
Sat, 20 Nov 2021 16:17:59 +0000 (18:17 +0200)
committerEli Zaretskii <eliz@gnu.org>
Sat, 20 Nov 2021 16:17:59 +0000 (18:17 +0200)
* 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

index 866e43fda94e562efc62ae601b79be4b39dfc0b3..41c92a4615557772830b157a0acdea5c6edd1d49 100644 (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.  */
       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,