diff --git a/src/buffer.c b/src/buffer.c
index af17b63..3a91719 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5105,6 +5105,8 @@
 		    e = s + 3;
 		vers = getdigits(&e);
 		if (*e == ':'
+			&& (s[0] != 'V'
+				  || STRNCMP(skipwhite(e + 1), "set", 3) == 0)
 			&& (s[3] == ':'
 			    || (VIM_VERSION_100 >= vers && isdigit(s[3]))
 			    || (VIM_VERSION_100 < vers && s[3] == '<')
diff --git a/src/version.c b/src/version.c
index f8dcc14..1d85f73 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1265,
+/**/
     1264,
 /**/
     1263,