emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 48c65f219d: (loadhist_initialize): Fix regression test failure


From: Stefan Monnier
Subject: master 48c65f219d: (loadhist_initialize): Fix regression test failure
Date: Sun, 20 Feb 2022 13:16:39 -0500 (EST)

branch: master
commit 48c65f219dcf2c9004fe995c79a132935b7d183a
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    (loadhist_initialize): Fix regression test failure
    
    * src/lread.c (loadhist_initialize): Adjust assertion for the nil case.
    (readevalloop): Signal an error for non-string `sourcename`.
---
 src/lread.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/lread.c b/src/lread.c
index d225403b20..0486a98883 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1172,7 +1172,7 @@ compute_found_effective (Lisp_Object found)
 static void
 loadhist_initialize (Lisp_Object filename)
 {
-  eassert (STRINGP (filename));
+  eassert (STRINGP (filename) || NILP (filename));
   specbind (Qcurrent_load_list, Fcons (filename, Qnil));
 }
 
@@ -2179,6 +2179,9 @@ readevalloop (Lisp_Object readcharfun,
   bool first_sexp = 1;
   Lisp_Object macroexpand = intern ("internal-macroexpand-for-load");
 
+  if (!NILP (sourcename))
+    CHECK_STRING (sourcename);
+
   if (NILP (Ffboundp (macroexpand))
       || (STRINGP (sourcename) && suffix_p (sourcename, ".elc")))
     /* Don't macroexpand before the corresponding function is defined



reply via email to

[Prev in Thread] Current Thread [Next in Thread]