comparison src/lread.c @ 82:6a378aca36af r20-0b91

Import from CVS: tag r20-0b91
author cvs
date Mon, 13 Aug 2007 09:07:36 +0200
parents 1ce6082ce73f
children fe104dbd9147
comparison
equal deleted inserted replaced
81:ebca3d831cea 82:6a378aca36af
575 575
576 /* If file name is magic, call the handler. */ 576 /* If file name is magic, call the handler. */
577 handler = Ffind_file_name_handler (file, Qload); 577 handler = Ffind_file_name_handler (file, Qload);
578 if (!NILP (handler)) 578 if (!NILP (handler))
579 RETURN_UNGCPRO (call5 (handler, Qload, file, no_error, 579 RETURN_UNGCPRO (call5 (handler, Qload, file, no_error,
580 nomessage, nosuffix)); 580 nomessage, nosuffix));
581 581
582 /* Do this after the handler to avoid 582 /* Do this after the handler to avoid
583 the need to gcpro noerror, nomessage and nosuffix. 583 the need to gcpro noerror, nomessage and nosuffix.
584 (Below here, we care only whether they are nil or not.) */ 584 (Below here, we care only whether they are nil or not.) */
585 file = Fsubstitute_in_file_name (file); 585 file = Fsubstitute_in_file_name (file);
670 to reopen it in text mode. */ 670 to reopen it in text mode. */
671 if (!reading_elc) 671 if (!reading_elc)
672 fd = open (foundstr, O_RDONLY | O_TEXT); 672 fd = open (foundstr, O_RDONLY | O_TEXT);
673 #endif /* DOS_NT */ 673 #endif /* DOS_NT */
674 674
675 #define PRINT_LOADING_MESSAGE(done) do { \ 675 #define PRINT_LOADING_MESSAGE(done) do { \
676 if (load_ignore_elc_files) \ 676 if (load_ignore_elc_files) \
677 { \ 677 { \
678 if (message_p) \ 678 if (message_p) \
679 message ("Loading %s..." done, XSTRING_DATA (newer)); \ 679 message ("Loading %s..." done, XSTRING_DATA (newer)); \
680 } \ 680 } \
681 else if (!NILP (newer)) \ 681 else if (!NILP (newer)) \
682 message ("Loading %s..." done " (file %s is newer)", \ 682 message ("Loading %s..." done " (file %s is newer)", \
683 XSTRING_DATA (file), \ 683 XSTRING_DATA (file), \
684 XSTRING_DATA (newer)); \ 684 XSTRING_DATA (newer)); \
685 else if (source_only) \ 685 else if (source_only) \
686 message ("Loading %s..." done " (file %s.elc does not exist)", \ 686 message ("Loading %s..." done " (file %s.elc does not exist)", \
687 XSTRING_DATA (file), \ 687 XSTRING_DATA (file), \
688 XSTRING_DATA (Ffile_name_nondirectory (file))); \ 688 XSTRING_DATA (Ffile_name_nondirectory (file))); \
689 else if (message_p) \ 689 else if (message_p) \
690 message ("Loading %s..." done, XSTRING_DATA (file)); \ 690 message ("Loading %s..." done, XSTRING_DATA (file)); \
691 } while (0) 691 } while (0)
692 692
693 PRINT_LOADING_MESSAGE (""); 693 PRINT_LOADING_MESSAGE ("");
694 694
695 { 695 {