emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 9f30a6b: * src/eval.c (Fapply): Simplify last change


From: Stefan Monnier
Subject: master 9f30a6b: * src/eval.c (Fapply): Simplify last change
Date: Mon, 28 Sep 2020 23:14:09 -0400 (EDT)

branch: master
commit 9f30a6b1a417cebe795956a7eef44b8cd9b71557
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    * src/eval.c (Fapply): Simplify last change
---
 src/eval.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/eval.c b/src/eval.c
index c34c118..0b23905 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2383,14 +2383,10 @@ usage: (apply FUNCTION &rest ARGUMENTS)  */)
   Lisp_Object fun = args[0];
   USE_SAFE_ALLOCA;
 
-  if (nargs == 1)
-    /* Special case: FUN is really a list of (FUNCTION . ARGS).  */
-    return CALLN (Fapply, CAR (fun), CDR (fun));
-
   ptrdiff_t numargs = list_length (spread_arg);
 
   if (numargs == 0)
-    return Ffuncall (nargs - 1, args);
+    return Ffuncall (max (1, nargs - 1), args);
   else if (numargs == 1)
     {
       args [nargs - 1] = XCAR (spread_arg);



reply via email to

[Prev in Thread] Current Thread [Next in Thread]