From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 29 Jun 2013 13:07:22 +0000 (+0200)
Subject: updated for version 7.3.1265
X-Git-Tag: v7.3.1265
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=630a730f9b91511f8da556dd5dc0d15f0a23f46a;p=thirdparty%2Fvim.git

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 af17b63bab..3a91719d91 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 f8dcc142bf..1d85f73263 100644
--- 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,
 /**/