Commit 9ac66b45 authored by Juanma Barranquero's avatar Juanma Barranquero
Browse files

(do_autoload): Don't save autoloads.

parent 1a825e5d
...@@ -466,7 +466,7 @@ usage: (prog1 FIRST BODY...) */) ...@@ -466,7 +466,7 @@ usage: (prog1 FIRST BODY...) */)
struct gcpro gcpro1, gcpro2; struct gcpro gcpro1, gcpro2;
register int argnum = 0; register int argnum = 0;
if (NILP(args)) if (NILP (args))
return Qnil; return Qnil;
args_left = args; args_left = args;
...@@ -2146,7 +2146,7 @@ do_autoload (fundef, funname) ...@@ -2146,7 +2146,7 @@ do_autoload (fundef, funname)
Lisp_Object fundef, funname; Lisp_Object fundef, funname;
{ {
int count = SPECPDL_INDEX (); int count = SPECPDL_INDEX ();
Lisp_Object fun, queue, first, second; Lisp_Object fun;
struct gcpro gcpro1, gcpro2, gcpro3; struct gcpro gcpro1, gcpro2, gcpro3;
/* This is to make sure that loadup.el gives a clear picture /* This is to make sure that loadup.el gives a clear picture
...@@ -2167,20 +2167,6 @@ do_autoload (fundef, funname) ...@@ -2167,20 +2167,6 @@ do_autoload (fundef, funname)
Vautoload_queue = Qt; Vautoload_queue = Qt;
Fload (Fcar (Fcdr (fundef)), Qnil, noninteractive ? Qt : Qnil, Qnil, Qt); Fload (Fcar (Fcdr (fundef)), Qnil, noninteractive ? Qt : Qnil, Qnil, Qt);
/* Save the old autoloads, in case we ever do an unload. */
queue = Vautoload_queue;
while (CONSP (queue))
{
first = XCAR (queue);
second = Fcdr (first);
first = Fcar (first);
if (SYMBOLP (first) && CONSP (second) && EQ (XCAR (second), Qautoload))
Fput (first, Qautoload, (XCDR (second)));
queue = XCDR (queue);
}
/* Once loading finishes, don't undo it. */ /* Once loading finishes, don't undo it. */
Vautoload_queue = Qt; Vautoload_queue = Qt;
unbind_to (count, Qnil); unbind_to (count, Qnil);
......
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