diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 50c8f5841a..d5692c273c 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3346,6 +3346,7 @@ set_one_cmd_context(xp, buff)
 #endif
 		    ))
 	    {
+		len = 0;  /* avoid getting stuck when space is in 'isfname' */
 		while (*p != NUL)
 		{
 #ifdef FEAT_MBYTE
diff --git a/src/version.c b/src/version.c
index 24b734415a..d3a86e4586 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    265,
 /**/
     264,
 /**/