aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2022-11-20 21:40:08 +0100
committerJuanma Barranquero2022-11-20 21:40:08 +0100
commit8ec8decd9f1ab642c7f1406b37a89773345b5aba (patch)
treeea5bb0df657b5df28b11a87bc62d92cada280e1a /src
parent4bc9fe33afa4a2dc063e7c25d6098ad98fcb0208 (diff)
downloademacs-8ec8decd9f1ab642c7f1406b37a89773345b5aba.tar.gz
emacs-8ec8decd9f1ab642c7f1406b37a89773345b5aba.zip
Avoid native compiler setting user-init-file to warnings.el (bug#59358)
* src/lread.c (maybe_swap_for_eln): Use a delayed warning instead of `display-warning' to avoid a recursive call to Fload while loading the init file that sets `user-init-file' to a bogus value.
Diffstat (limited to 'src')
-rw-r--r--src/lread.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/lread.c b/src/lread.c
index c28324dc35b..2a57f721943 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1741,12 +1741,15 @@ maybe_swap_for_eln (bool no_native, Lisp_Object *filename, int *fd,
1741 Vload_path, 1741 Vload_path,
1742 Qnil, Qnil))) 1742 Qnil, Qnil)))
1743 return; 1743 return;
1744 call2 (intern_c_string ("display-warning"), 1744 Vdelayed_warnings_list
1745 Qcomp, 1745 = Fcons (list2
1746 CALLN (Fformat, 1746 (Qcomp,
1747 build_string ("Cannot look up eln file as " 1747 CALLN (Fformat,
1748 "no source file was found for %s"), 1748 build_string ("Cannot look up eln "
1749 *filename)); 1749 "file as no source file "
1750 "was found for %s"),
1751 *filename)),
1752 Vdelayed_warnings_list);
1750 return; 1753 return;
1751 } 1754 }
1752 } 1755 }