aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2020-09-28 23:14:03 -0400
committerStefan Monnier2020-09-28 23:14:03 -0400
commit9f30a6b1a417cebe795956a7eef44b8cd9b71557 (patch)
tree77c5bb31ee951acb209f8449225139cb185c5549 /src
parent9f1ca64ffe2f0c3045acffc41c95d26a84959eca (diff)
downloademacs-9f30a6b1a417cebe795956a7eef44b8cd9b71557.tar.gz
emacs-9f30a6b1a417cebe795956a7eef44b8cd9b71557.zip
* src/eval.c (Fapply): Simplify last change
Diffstat (limited to 'src')
-rw-r--r--src/eval.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/eval.c b/src/eval.c
index c34c11828c5..0b23905207d 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2383,14 +2383,10 @@ usage: (apply FUNCTION &rest ARGUMENTS) */)
2383 Lisp_Object fun = args[0]; 2383 Lisp_Object fun = args[0];
2384 USE_SAFE_ALLOCA; 2384 USE_SAFE_ALLOCA;
2385 2385
2386 if (nargs == 1)
2387 /* Special case: FUN is really a list of (FUNCTION . ARGS). */
2388 return CALLN (Fapply, CAR (fun), CDR (fun));
2389
2390 ptrdiff_t numargs = list_length (spread_arg); 2386 ptrdiff_t numargs = list_length (spread_arg);
2391 2387
2392 if (numargs == 0) 2388 if (numargs == 0)
2393 return Ffuncall (nargs - 1, args); 2389 return Ffuncall (max (1, nargs - 1), args);
2394 else if (numargs == 1) 2390 else if (numargs == 1)
2395 { 2391 {
2396 args [nargs - 1] = XCAR (spread_arg); 2392 args [nargs - 1] = XCAR (spread_arg);