summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-06-29 15:07:22 +0200
committerBram Moolenaar <bram@vim.org>2013-06-29 15:07:22 +0200
commita1cf7e011630c1aab4c6a3cabb7658b48b981fd9 (patch)
tree105bf1ede0c61293f07182f42dec15592548e9d9
parent1f13168a8709f2c29b70f9168e269858b10324da (diff)
downloadvim-a1cf7e011630c1aab4c6a3cabb7658b48b981fd9.tar.gz
updated for version 7.3.1265v7.3.1265v7-3-1265
Problem: Accepting "Vim:" for a modeline causes errors too often. Solution: Require "Vim:" to be followed by "set".
-rw-r--r--src/buffer.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/buffer.c b/src/buffer.c
index af17b63b..3a91719d 100644
--- 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 f8dcc142..1d85f732 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1265,
+/**/
1264,
/**/
1263,