diff options
| author | Gerd Moellmann <gerd@gnu.org> | 2000-09-11 13:01:38 +0000 |
|---|---|---|
| committer | Gerd Moellmann <gerd@gnu.org> | 2000-09-11 13:01:38 +0000 |
| commit | f74b07059d4bd017536a77a792b0575d6c2f1a1b (patch) | |
| tree | 5b7634e63c0bee072a725680888d8727118a047e /src/lread.c | |
| parent | 7ee3bd7bf87ccceed644415da2d45f8a1e7b15f4 (diff) | |
| download | emacs-f74b07059d4bd017536a77a792b0575d6c2f1a1b.tar.gz | |
(init_lread): Set Vloads_in_progress to nil.
(Fload): Show list of recursively loaded files, when signaling an
error.
Diffstat (limited to 'src/lread.c')
| -rw-r--r-- | src/lread.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lread.c b/src/lread.c index 0788eb85068..3a0acdd104f 100644 --- a/src/lread.c +++ b/src/lread.c @@ -711,7 +711,8 @@ Return t if file exists.") /* Check if we're loading this file again while another load of the same file is already in progress. */ if (!NILP (Fmember (found, Vloads_in_progress))) - error ("Recursive load of file `%s'", XSTRING (file)->data); + Fsignal (Qerror, Fcons (build_string ("Recursive load"), + Fcons (found, Vloads_in_progress))); record_unwind_protect (record_load_unwind, Vloads_in_progress); Vloads_in_progress = Fcons (found, Vloads_in_progress); @@ -3428,6 +3429,7 @@ init_lread () load_descriptor_list = Qnil; Vstandard_input = Qt; + Vloads_in_progress = Qnil; } /* Print a warning, using format string FORMAT, that directory DIRNAME |