updated for version 7.3.1265

Problem:    Accepting "Vim:" for a modeline causes errors too often.
Solution:   Require "Vim:" to be followed by "set".

diff --git a/src/buffer.c b/src/buffer.c
index af17b63bab032fa158ad0d0b39204c4690d6dbcb..3a91719d919ae4fbf4ed070d5cdc18f832836e5b 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5105,6 +5105,8 @@ chk_modeline(lnum, flags)
                    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 f8dcc142bfd0eb6724251197238cfc7fe371417c..1d85f732637d05a434538f51459ffdc196fcc281 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1265,
 /**/
     1264,
 /**/