From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 13 May 2014 10:17:15 +0000 (+0200)
Subject: updated for version 7.4.284
X-Git-Tag: v7.4.284
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed7547da438e44e7907bd9fd488f6b961f23e1e0;p=vim

updated for version 7.4.284
Problem:    Setting 'langmap' in the modeline can cause trouble.  E.g. mapping
            ":" breaks many commands. (Jens-Wolfhard Schicke-Uffmann)
Solution:   Disallow setting 'langmap' from the modeline.
---

diff --git a/src/option.c b/src/option.c
index 86e47571c..a36f8c0a0 100644
--- a/src/option.c
+++ b/src/option.c
@@ -1652,7 +1652,7 @@ static struct vimoption
 #endif
 #endif
 				(char_u *)0L} SCRIPTID_INIT},
-    {"langmap",     "lmap", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+    {"langmap",     "lmap", P_STRING|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE,
 #ifdef FEAT_LANGMAP
 			    (char_u *)&p_langmap, PV_NONE,
 			    {(char_u *)"",	/* unmatched } */
diff --git a/src/version.c b/src/version.c
index ae03814df..739057d01 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    284,
 /**/
     283,
 /**/