Mercurial > emacs

changeset 61250:4c111b6f6378

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Ffuncall): Always call CHECK_CONS_LIST on entry. Call it again after autoload.
author Kim F. Storm <storm@cua.dk>
date Sun, 03 Apr 2005 22:08:58 +0000
parents a3a3ff0c57f3
children b265ce19eaf8
files src/eval.c
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/eval.c	Sun Apr 03 22:08:17 2005 +0000
+++ b/src/eval.c	Sun Apr 03 22:08:58 2005 +0000
@@ -2742,6 +2742,8 @@
   if (debug_on_next_call)
     do_debug_on_call (Qlambda);
 
+  CHECK_CONS_LIST ();
+
  retry:
 
   fun = args[0];
@@ -2750,9 +2752,7 @@
 
   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 @@
       else if (EQ (funcar, Qautoload))
 	{
 	  do_autoload (fun, args[0]);
+	  CHECK_CONS_LIST ();
 	  goto retry;
 	}
       else