diff --git a/src/userfunc.c b/src/userfunc.c
index b88b512..bc7d923 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -4014,7 +4014,10 @@
     // Save the starting line number.
     sourcing_lnum_top = SOURCING_LNUM;
 
-    if (get_function_body(eap, &newlines, line_arg, &line_to_free) == FAIL)
+    // Do not define the function when getting the body fails and when
+    // skipping.
+    if (get_function_body(eap, &newlines, line_arg, &line_to_free) == FAIL
+	    || eap->skip)
 	goto erret;
 
     /*
diff --git a/src/version.c b/src/version.c
index fb72050..5e2a52c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2865,
+/**/
     2864,
 /**/
     2863,