diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-09-02 19:34:10 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-09-02 19:34:10 +0200 |
| commit | da9ce2cde11ddd0e16cdfbab6d4ac4e8110218e1 (patch) | |
| tree | 717251d80c1b060e52d9495339e5f47f1041d6f8 | |
| parent | 19a1669ffc796e30a83c5600f82f12ebf63a2261 (diff) | |
| download | vim-git-da9ce2cde11ddd0e16cdfbab6d4ac4e8110218e1.tar.gz | |
patch 7.4.2306v7.4.2306
Problem: Default value for 'langremap' is wrong.
Solution: Set the right value. (Jürgen Krämer) Add a test.
| -rw-r--r-- | src/option.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_mapping.vim | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 11 insertions, 1 deletions
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+\<Esc>", "xt") diff --git a/src/version.c b/src/version.c index fa045f604..d68b76cac 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2306, +/**/ 2305, /**/ 2304, |