Commit 06100606 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(Frequire): Treat evaluating from a source file

like loading the file.
parent 356e6d8d
......@@ -3559,14 +3559,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)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment