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 86e47571c76855fc17613e04bfbc7fffb621e889..a36f8c0a01f5f5260d5514fb07854290d69ac76c 100644 (file)
--- 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 ae03814dfb2cbd7a4524e894e62697ae804a403c..739057d011a9ef9c37da6513216d9a59d5115290 100644 (file)
--- 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,
 /**/