diff --git a/src/evalfunc.c b/src/evalfunc.c
index b374d55..6a9f9d6 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -2536,7 +2536,7 @@
 		    arg_idx = 0;
 		else if (list->lv_len > MAX_FUNC_ARGS)
 		{
-		    emsg_funcname((char *)e_toomanyarg, name);
+		    emsg_funcname((char *)e_toomanyarg, s);
 		    vim_free(name);
 		    goto theend;
 		}
diff --git a/src/version.c b/src/version.c
index c327f98..06edccd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2335,
+/**/
     2334,
 /**/
     2333,