From: Juanma Barranquero <lekktu@gmail.com>
Date: Sun, 14 Oct 2007 18:00:05 +0000 (+0000)
Subject: (do_autoload): Don't save autoloads.
X-Git-Tag: emacs-pretest-22.1.90~611
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9ac66b454877410de28e8c13b3986d0dc7fa7b26;p=emacs.git

(do_autoload): Don't save autoloads.
---

diff --git a/src/eval.c b/src/eval.c
index ef789ef9454..3ffacf7d196 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -466,7 +466,7 @@ usage: (prog1 FIRST BODY...)  */)
   struct gcpro gcpro1, gcpro2;
   register int argnum = 0;
 
-  if (NILP(args))
+  if (NILP (args))
     return Qnil;
 
   args_left = args;
@@ -2146,7 +2146,7 @@ do_autoload (fundef, funname)
      Lisp_Object fundef, funname;
 {
   int count = SPECPDL_INDEX ();
-  Lisp_Object fun, queue, first, second;
+  Lisp_Object fun;
   struct gcpro gcpro1, gcpro2, gcpro3;
 
   /* This is to make sure that loadup.el gives a clear picture
@@ -2167,20 +2167,6 @@ do_autoload (fundef, funname)
   Vautoload_queue = 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.  */
   Vautoload_queue = Qt;
   unbind_to (count, Qnil);