From f68bf38547d85587a012dcbd7a4c92f2087b11af Mon Sep 17 00:00:00 2001
From: oni-link <knil.ino@gmail.com>
Date: Thu, 22 May 2014 11:41:45 +0200
Subject: vim-patch:7.4.284  #748

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.

https://code.google.com/p/vim/source/detail?r=3c35ca9666e88a8024af6dab585b8e79ab295f83
---
 src/nvim/option.c  | 2 +-
 src/nvim/version.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/nvim/option.c b/src/nvim/option.c
index b5ee27f3b5..37a5a61d43 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -1017,7 +1017,7 @@ static struct vimoption
 #  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,
    (char_u *)&p_langmap, PV_NONE,
    {(char_u *)"",                               /* unmatched } */
     (char_u *)0L} SCRIPTID_INIT},
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 5c261c4240..850ec79e82 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -203,7 +203,7 @@ static char *(features[]) = {
 static int included_patches[] = {
   // Add new patch number below this line
   285,
-  //284,
+  284,
   //283,
   282,
   281,
-- 
cgit