diff --git a/src/option.c b/src/option.c
index 31bf876..3314a3c 100644
--- a/src/option.c
+++ b/src/option.c
@@ -5812,8 +5812,8 @@
 
 	if (should_copy || (flags & BCO_ALWAYS))
 	{
-	    vim_memset(buf->b_p_script_ctx, 0, sizeof(buf->b_p_script_ctx));
 #ifdef FEAT_EVAL
+	    vim_memset(buf->b_p_script_ctx, 0, sizeof(buf->b_p_script_ctx));
 	    init_buf_opt_idx();
 #endif
 	    // Don't copy the options specific to a help buffer when
diff --git a/src/version.c b/src/version.c
index dd957cd..65979b2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2186,
+/**/
     2185,
 /**/
     2184,