From: Kim F. Storm <storm@cua.dk>
Date: Sun, 3 Apr 2005 22:08:58 +0000 (+0000)
Subject: (Ffuncall): Always call CHECK_CONS_LIST on entry.
X-Git-Url: https://git.hcoop.net/bpt/emacs.git/commitdiff_plain/fff3ff9c18075000c0cf478fe76011769cdf027a

(Ffuncall): Always call CHECK_CONS_LIST on entry.
Call it again after autoload.
---

diff --git a/src/eval.c b/src/eval.c
index bf4fec4f8a..8700ca222c 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2742,6 +2742,8 @@ usage: (funcall FUNCTION &rest ARGUMENTS)  */)
   if (debug_on_next_call)
     do_debug_on_call (Qlambda);
 
+  CHECK_CONS_LIST ();
+
  retry:
 
   fun = args[0];
@@ -2750,9 +2752,7 @@ usage: (funcall FUNCTION &rest ARGUMENTS)  */)
 
   if (SUBRP (fun))
     {
-      CHECK_CONS_LIST ();
-
-      if (numargs < XSUBR (fun)->min_args
+       if (numargs < XSUBR (fun)->min_args
 	  || (XSUBR (fun)->max_args >= 0 && XSUBR (fun)->max_args < numargs))
 	{
 	  XSETFASTINT (lisp_numargs, numargs);
@@ -2844,6 +2844,7 @@ usage: (funcall FUNCTION &rest ARGUMENTS)  */)
       else if (EQ (funcar, Qautoload))
 	{
 	  do_autoload (fun, args[0]);
+	  CHECK_CONS_LIST ();
 	  goto retry;
 	}
       else