[PATCH] src/eval.c (Fapply): Remove unnecessary goto

[Lee Duhem]

---
 src/ChangeLog |  4 ++++
 src/eval.c    | 12 ++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 448de36..663ca9e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-25  Lee Duhem  <address@hidden>
+
+ * eval.c (Fapply): Remove unnecessary goto.
+
 2014-11-24  Lars Magne Ingebrigtsen  <address@hidden>

  * gnutls.c: Fix compilation warnings given fix --enable-gcc-warnings.
diff --git a/src/eval.c b/src/eval.c
index 77b1db9..45e5389 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2298,19 +2298,15 @@ usage: (apply FUNCTION &rest ARGUMENTS)  */)
   if (SYMBOLP (fun) && !NILP (fun)
       && (fun = XSYMBOL (fun)->function, SYMBOLP (fun)))
     fun = indirect_function (fun);
+
   if (NILP (fun))
     {
       /* Let funcall get the error.  */
       fun = args[0];
-      goto funcall;
     }
-
-  if (SUBRP (fun))
+  else if (SUBRP (fun))
     {
-      if (numargs < XSUBR (fun)->min_args
-  || (XSUBR (fun)->max_args >= 0 && XSUBR (fun)->max_args < numargs))
- goto funcall; /* Let funcall get the error.  */
-      else if (XSUBR (fun)->max_args >= 0 && XSUBR (fun)->max_args > numargs)
+      if (XSUBR (fun)->max_args >= 0 && XSUBR (fun)->max_args > numargs)
  {
   /* Avoid making funcall cons up a yet another new vector of arguments
      by explicitly supplying nil's for optional values.  */
@@ -2320,7 +2316,7 @@ usage: (apply FUNCTION &rest ARGUMENTS)  */)
   funcall_nargs = 1 + XSUBR (fun)->max_args;
  }
     }
- funcall:
+
   /* We add 1 to numargs because funcall_args includes the
      function itself as well as its arguments.  */
   if (!funcall_args)
-- 
1.9.3