summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-10-16 23:33:12 +0200
committerBram Moolenaar <Bram@vim.org>2019-10-16 23:33:12 +0200
commit2559a47823a6a7827631f2e6a0176d7afce2721c (patch)
tree4b0ca0890fefa2f4a1cb502d6422be51ca418a63
parent4a4981b7cd57b0b2289ed4f9d621ef4d90d767f0 (diff)
patch 8.1.2167: mapping test fails on MS-Windowsv8.1.2167
Problem: Mapping test fails on MS-Windows. Solution: Remove all the existing Insert-mode mappings.
-rw-r--r--src/testdir/test_mapping.vim4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim
index d3ae615411..4ba3645981 100644
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -444,8 +444,8 @@ func Test_error_in_map_expr()
endfunc
func Test_list_mappings()
- " Remove default Mac mapping
- silent! iunmap <D-v>
+ " Remove default mappings
+ imapclear
inoremap <C-M> CtrlM
inoremap <A-S> AltS
diff --git a/src/version.c b/src/version.c
index c7d0ace489..3bcd910c13 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2167,
+/**/
2166,
/**/
2165,