diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-12-19 19:57:22 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-12-19 19:57:22 +0000 |
| commit | e93b29568add51c918892153759a1fcd440e85be (patch) | |
| tree | 4ca3494b355f5df3d0cdbe155eeaa3f630f293c1 /src/fns.c | |
| parent | 8d3cdf56502e89f00e86b02f24422acfa1b34beb (diff) | |
| parent | 3031d8b0bb97f21c79b3022ff3e7564173facd18 (diff) | |
| download | emacs-e93b29568add51c918892153759a1fcd440e85be.tar.gz emacs-e93b29568add51c918892153759a1fcd440e85be.tar.bz2 emacs-e93b29568add51c918892153759a1fcd440e85be.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 169-173, 671-676)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-671
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-672
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-673
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-674
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-675
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-676
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-169
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-170
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-171
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-172
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-173
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-454
Diffstat (limited to 'src/fns.c')
| -rw-r--r-- | src/fns.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/fns.c b/src/fns.c index d0d4da4cd57..d30d49a80c7 100644 --- a/src/fns.c +++ b/src/fns.c @@ -3564,14 +3564,20 @@ The normal messages at start and end of loading FILENAME are suppressed. */) { register Lisp_Object tem; struct gcpro gcpro1, gcpro2; + int from_file = load_in_progress; CHECK_SYMBOL (feature); /* Record the presence of `require' in this file even if the feature specified is already loaded. But not more than once in any file, - and not when we aren't loading a file. */ - if (load_in_progress) + and not when we aren't loading or reading from a file. */ + if (!from_file) + for (tem = Vcurrent_load_list; CONSP (tem); tem = XCDR (tem)) + if (NILP (XCDR (tem)) && STRINGP (XCAR (tem))) + from_file = 1; + + if (from_file) { tem = Fcons (Qrequire, feature); if (NILP (Fmember (tem, Vcurrent_load_list))) |