From da9ce2cde11ddd0e16cdfbab6d4ac4e8110218e1 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 2 Sep 2016 19:34:10 +0200 Subject: [PATCH] =?utf8?q?patch=207.4.2306=20Problem:=20=20=20=20Default?= =?utf8?q?=20value=20for=20'langremap'=20is=20wrong.=20Solution:=20=20=20S?= =?utf8?q?et=20the=20right=20value.=20(J=C3=BCrgen=20Kr=C3=A4mer)=20=20Add?= =?utf8?q?=20a=20test.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/option.c | 2 +- src/testdir/test_mapping.vim | 8 ++++++++ src/version.c | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/option.c b/src/option.c index 7e362408a..93e3c391f 100644 --- a/src/option.c +++ b/src/option.c @@ -1711,7 +1711,7 @@ static struct vimoption options[] = #else (char_u *)NULL, PV_NONE, #endif - {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, + {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"laststatus", "ls", P_NUM|P_VI_DEF|P_RALL, #ifdef FEAT_WINDOWS (char_u *)&p_ls, PV_NONE, diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim index 66b81cecf..306eb2fae 100644 --- a/src/testdir/test_mapping.vim +++ b/src/testdir/test_mapping.vim @@ -72,6 +72,14 @@ func Test_map_langmap() set nolangremap call assert_equal(1, &langnoremap) + " check default values + set langnoremap& + call assert_equal(0, &langnoremap) + call assert_equal(1, &langremap) + set langremap& + call assert_equal(0, &langnoremap) + call assert_equal(1, &langremap) + " langmap should not apply in insert mode, 'langremap' doesn't matter set langmap=+{ nolangremap call feedkeys("Go+\", "xt") diff --git a/src/version.c b/src/version.c index fa045f604..d68b76cac 100644 --- a/src/version.c +++ b/src/version.c @@ -763,6 +763,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2306, /**/ 2305, /**/ -- 2.50.1