aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoroni-link <knil.ino@gmail.com>2014-05-22 11:41:45 +0200
committerJustin M. Keyes <justinkz@gmail.com>2014-06-05 18:27:10 -0400
commitf68bf38547d85587a012dcbd7a4c92f2087b11af (patch)
tree053db13023fc9f048ef1d6ab1e579136faf6d83d
parent1057b29c8ce2c86727a63b0eecde8196ce63832c (diff)
downloadrneovim-f68bf38547d85587a012dcbd7a4c92f2087b11af.tar.gz
rneovim-f68bf38547d85587a012dcbd7a4c92f2087b11af.tar.bz2
rneovim-f68bf38547d85587a012dcbd7a4c92f2087b11af.zip
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
-rw-r--r--src/nvim/option.c2
-rw-r--r--src/nvim/version.c2
2 files changed, 2 insertions, 2 deletions
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,