summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-10-16 22:27:49 +0200
committerBram Moolenaar <Bram@vim.org>2019-10-16 22:27:49 +0200
commit4f2f61a014e80217a2d6ac476c8f94e250a3d0ff (patch)
tree879ca1315d973cb3bf26e82f4842cab9030da6b8
parent7b3d93966709998011e2eb3b84414ff454161b37 (diff)
patch 8.1.2165: mapping test fails on Macv8.1.2165
Problem: Mapping test fails on Mac. Solution: Remove the default Mac mapping.
-rw-r--r--src/testdir/test_mapping.vim3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim
index f62d5755ec..d3ae615411 100644
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -444,6 +444,9 @@ func Test_error_in_map_expr()
endfunc
func Test_list_mappings()
+ " Remove default Mac mapping
+ silent! iunmap <D-v>
+
inoremap <C-M> CtrlM
inoremap <A-S> AltS
inoremap <S-/> ShiftSlash
diff --git a/src/version.c b/src/version.c
index f6a3817da6..e7ba706b43 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 */
/**/
+ 2165,
+/**/
2164,
/**/
2163,