Mercurial > emacs

changeset 31536:76cf765a7dad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(init_lread): Set Vloads_in_progress to nil. (Fload): Show list of recursively loaded files, when signaling an error.
author Gerd Moellmann <gerd@gnu.org>
date Mon, 11 Sep 2000 13:00:41 +0000
parents 2914658cb414
children 6f330e666e31
files src/lread.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/lread.c	Mon Sep 11 12:52:59 2000 +0000
+++ b/src/lread.c	Mon Sep 11 13:00:41 2000 +0000
@@ -711,7 +711,8 @@
   /* 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 @@
   load_descriptor_list = Qnil;
 
   Vstandard_input = Qt;
+  Vloads_in_progress = Qnil;
 }
 
 /* Print a warning, using format string FORMAT, that directory DIRNAME