Mercurial > emacs
comparison src/lread.c @ 31536:76cf765a7dad
(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 | 0bfeb94864e2 |
children | 8a8d8035d369 |
comparison
equal
deleted
inserted
replaced
31535:2914658cb414 | 31536:76cf765a7dad |
---|---|
709 } | 709 } |
710 | 710 |
711 /* Check if we're loading this file again while another load | 711 /* Check if we're loading this file again while another load |
712 of the same file is already in progress. */ | 712 of the same file is already in progress. */ |
713 if (!NILP (Fmember (found, Vloads_in_progress))) | 713 if (!NILP (Fmember (found, Vloads_in_progress))) |
714 error ("Recursive load of file `%s'", XSTRING (file)->data); | 714 Fsignal (Qerror, Fcons (build_string ("Recursive load"), |
715 Fcons (found, Vloads_in_progress))); | |
715 record_unwind_protect (record_load_unwind, Vloads_in_progress); | 716 record_unwind_protect (record_load_unwind, Vloads_in_progress); |
716 Vloads_in_progress = Fcons (found, Vloads_in_progress); | 717 Vloads_in_progress = Fcons (found, Vloads_in_progress); |
717 | 718 |
718 /* Load .elc files directly, but not when they are | 719 /* Load .elc files directly, but not when they are |
719 remote and have no handler! */ | 720 remote and have no handler! */ |
3426 Vload_file_name = Qnil; | 3427 Vload_file_name = Qnil; |
3427 | 3428 |
3428 load_descriptor_list = Qnil; | 3429 load_descriptor_list = Qnil; |
3429 | 3430 |
3430 Vstandard_input = Qt; | 3431 Vstandard_input = Qt; |
3432 Vloads_in_progress = Qnil; | |
3431 } | 3433 } |
3432 | 3434 |
3433 /* Print a warning, using format string FORMAT, that directory DIRNAME | 3435 /* Print a warning, using format string FORMAT, that directory DIRNAME |
3434 does not exist. Print it on stderr and put it in *Message*. */ | 3436 does not exist. Print it on stderr and put it in *Message*. */ |
3435 | 3437 |