mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 02:51:31 -08:00
Code Issues Projects Releases Wiki Activity

(Fapply): Undo last change and add a comment about why.

Browse source
This commit is contained in:
Stefan Monnier 2003-04-19 18:58:56 +00:00
parent e31afc09af
commit 96d44c6499
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/eval.c
View file

@ -2161,7 +2161,7 @@ usage: (apply FUNCTION &rest ARGUMENTS) */)
register Lisp_Object spread_arg;
register Lisp_Object *funcall_args;
Lisp_Object fun;
int nvars;
struct gcpro gcpro1;
fun = args [0];
funcall_args = 0;
@ -2201,7 +2201,8 @@ usage: (apply FUNCTION &rest ARGUMENTS) */)
* sizeof (Lisp_Object));
for (i = numargs; i < XSUBR (fun)->max_args;)
funcall_args[++i] = Qnil;
nvars = 1 + XSUBR (fun)->max_args;
GCPRO1 (*funcall_args);
gcpro1.nvars = 1 + XSUBR (fun)->max_args;
}
}
funcall:
@ -2211,7 +2212,8 @@ usage: (apply FUNCTION &rest ARGUMENTS) */)
{
funcall_args = (Lisp_Object *) alloca ((1 + numargs)
* sizeof (Lisp_Object));
nvars = 1 + numargs;
GCPRO1 (*funcall_args);
gcpro1.nvars = 1 + numargs;
}
bcopy (args, funcall_args, nargs * sizeof (Lisp_Object));
@ -2224,7 +2226,8 @@ usage: (apply FUNCTION &rest ARGUMENTS) */)
spread_arg = XCDR (spread_arg);
}
return Ffuncall (nvars, funcall_args);
/* By convention, the caller needs to gcpro Ffuncall's args. */
RETURN_UNGCPRO (Ffuncall (gcpro1.nvars, funcall_args));
}
/* Run hook variables in various ways. */