From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 29 Sep 2020 03:14:03 +0000 (-0400)
Subject: * src/eval.c (Fapply): Simplify last change
X-Git-Tag: emacs-28.0.90~5835
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9f30a6b1a417cebe795956a7eef44b8cd9b71557;p=emacs.git

* src/eval.c (Fapply): Simplify last change
---

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)  */)
   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);