Mercurial > hg > xemacs-beta
comparison src/lread.c @ 1275:57b76886836d
[xemacs-hg @ 2003-02-08 02:29:52 by ben]
fixes to hyper-apropos, menubar-items, text-props, update-elc, lread.c; see log msg in lisp/ChangeLog
author | ben |
---|---|
date | Sat, 08 Feb 2003 02:29:55 +0000 |
parents | b5a5863da615 |
children | f3437b56874d |
comparison
equal
deleted
inserted
replaced
1274:2dcc22ec7640 | 1275:57b76886836d |
---|---|
499 Lisp_Object found = Qnil; | 499 Lisp_Object found = Qnil; |
500 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; | 500 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; |
501 int reading_elc = 0; | 501 int reading_elc = 0; |
502 int from_require = EQ (nomessage, Qrequire); | 502 int from_require = EQ (nomessage, Qrequire); |
503 int message_p = NILP (nomessage) || load_always_display_messages; | 503 int message_p = NILP (nomessage) || load_always_display_messages; |
504 static Lisp_Object last_file_loaded; | |
505 struct stat s1, s2; | 504 struct stat s1, s2; |
506 Ibyte *spaces = alloca_ibytes (load_in_progress * 2 + 10); | 505 Ibyte *spaces = alloca_ibytes (load_in_progress * 2 + 10); |
507 int i; | 506 int i; |
508 | 507 |
509 GCPRO4 (file, newer, older, found); | 508 GCPRO4 (file, newer, older, found); |
510 CHECK_STRING (file); | 509 CHECK_STRING (file); |
511 | |
512 if (noninteractive) | |
513 last_file_loaded = file; | |
514 | 510 |
515 /* If file name is magic, call the handler. */ | 511 /* If file name is magic, call the handler. */ |
516 handler = Ffind_file_name_handler (file, Qload); | 512 handler = Ffind_file_name_handler (file, Qload); |
517 if (!NILP (handler)) | 513 if (!NILP (handler)) |
518 RETURN_UNGCPRO (call5 (handler, Qload, file, noerror, | 514 RETURN_UNGCPRO (call5 (handler, Qload, file, noerror, |
749 tem = Fcons (Qprogn, Fcdr (tem)); | 745 tem = Fcons (Qprogn, Fcdr (tem)); |
750 Feval (tem); | 746 Feval (tem); |
751 NUNGCPRO; | 747 NUNGCPRO; |
752 } | 748 } |
753 } | 749 } |
754 | |
755 if (message_p && noninteractive && !EQ (last_file_loaded, file)) | |
756 { | |
757 if (from_require) | |
758 message ("%sRequiring %s ...done", spaces, XSTRING_DATA (file)); | |
759 else | |
760 message ("%sLoading %s ...done", spaces, XSTRING_DATA (file)); | |
761 } | |
762 | 750 |
763 if (!noninteractive) | 751 if (!noninteractive) |
764 PRINT_LOADING_MESSAGE ("done"); | 752 PRINT_LOADING_MESSAGE ("done"); |
765 | 753 |
766 UNGCPRO; | 754 UNGCPRO; |