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
commit630a730f9b91511f8da556dd5dc0d15f0a23f46a (patch)
tree28e181b5ca5eba5a793f52cfc93075ca96c87552
parentf3fe39276039f78beb7ce5a2ea21c445bee70545 (diff)
downloadvim-git-630a730f9b91511f8da556dd5dc0d15f0a23f46a.tar.gz
updated for version 7.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 af17b63ba..3a91719d9 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 f8dcc142b..1d85f7326 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,