comparison src/eval.c @ 2596:ee5b45777c6f

(un_autoload): Don't try to save old autoload forms when we load something in. Something about the code now conditioned out by UNLOAD was screwing up ordinary autoloads, notably of picture.el. When I figure out what, I'll fix and re-enable this code.

2595:6a1ad0661928

  /* Value saved here is to be restored into Vautoload_queue */
  record_unwind_protect (un_autoload, Vautoload_queue);
  Vautoload_queue = Qt;
  Fload (Fcar (Fcdr (fundef)), Qnil, noninteractive ? Qt : Qnil, Qnil);

  /* Save the old autoloads, in case we ever do an unload. */
  queue = Vautoload_queue;
  while (CONSP (queue))
    {
      first = Fcar (queue);

      first = Fcar (first);
      if (!EQ (second, Qnil))
	  Fput(first, Qautoload, (Fcdr (second)));
      queue = Fcdr (queue);
    }

  /* Once loading finishes, don't undo it.  */
  Vautoload_queue = Qt;
  unbind_to (count, Qnil);

2596:ee5b45777c6f

  /* Value saved here is to be restored into Vautoload_queue */
  record_unwind_protect (un_autoload, Vautoload_queue);
  Vautoload_queue = Qt;
  Fload (Fcar (Fcdr (fundef)), Qnil, noninteractive ? Qt : Qnil, Qnil);

#ifdef UNLOAD
  /* Save the old autoloads, in case we ever do an unload. */
  queue = Vautoload_queue;
  while (CONSP (queue))
    {
      first = Fcar (queue);

      first = Fcar (first);
      if (!EQ (second, Qnil))
	  Fput(first, Qautoload, (Fcdr (second)));
      queue = Fcdr (queue);
    }
#endif /* UNLOAD */

  /* Once loading finishes, don't undo it.  */
  Vautoload_queue = Qt;
  unbind_to (count, Qnil);