Mercurial > emacs
comparison src/lread.c @ 31554:8a8d8035d369
(Fload): Put code checking for recursive loads in #if 0.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Tue, 12 Sep 2000 10:58:42 +0000 |
parents | 76cf765a7dad |
children | e57e942d4ca1 |
comparison
equal
deleted
inserted
replaced
31553:c26265a22302 | 31554:8a8d8035d369 |
---|---|
706 handler = Ffind_file_name_handler (found, Qload); | 706 handler = Ffind_file_name_handler (found, Qload); |
707 if (! NILP (handler)) | 707 if (! NILP (handler)) |
708 return call5 (handler, Qload, found, noerror, nomessage, Qt); | 708 return call5 (handler, Qload, found, noerror, nomessage, Qt); |
709 } | 709 } |
710 | 710 |
711 #if 0 /* This is a good idea, but it doesn't quite work. | |
712 While compiling files, `provide's seem to not be evaluated. | |
713 Let's come back to this when there's more time. */ | |
714 | |
711 /* Check if we're loading this file again while another load | 715 /* Check if we're loading this file again while another load |
712 of the same file is already in progress. */ | 716 of the same file is already in progress. */ |
713 if (!NILP (Fmember (found, Vloads_in_progress))) | 717 if (!NILP (Fmember (found, Vloads_in_progress))) |
714 Fsignal (Qerror, Fcons (build_string ("Recursive load"), | 718 Fsignal (Qerror, Fcons (build_string ("Recursive load"), |
715 Fcons (found, Vloads_in_progress))); | 719 Fcons (found, Vloads_in_progress))); |
716 record_unwind_protect (record_load_unwind, Vloads_in_progress); | 720 record_unwind_protect (record_load_unwind, Vloads_in_progress); |
717 Vloads_in_progress = Fcons (found, Vloads_in_progress); | 721 Vloads_in_progress = Fcons (found, Vloads_in_progress); |
722 #endif /* 0 */ | |
718 | 723 |
719 /* Load .elc files directly, but not when they are | 724 /* Load .elc files directly, but not when they are |
720 remote and have no handler! */ | 725 remote and have no handler! */ |
721 if (!bcmp (&(XSTRING (found)->data[STRING_BYTES (XSTRING (found)) - 4]), | 726 if (!bcmp (&(XSTRING (found)->data[STRING_BYTES (XSTRING (found)) - 4]), |
722 ".elc", 4) | 727 ".elc", 4) |