summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_mapping.vim6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim
index 58a5d95901..4212731f35 100644
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -478,8 +478,12 @@ func Test_list_mappings()
\ execute('nmap ,n')->trim()->split("\n"))
" verbose map
+ " first line might be "seen modifyOtherKeys"
+ let lines = execute('verbose map ,n')->trim()->split("\n")
+ let index = indexof(lines, 'v:val =~ "Last set"')
+ call assert_inrange(1, 2, index)
call assert_match("\tLast set from .*/test_mapping.vim line \\d\\+$",
- \ execute('verbose map ,n')->trim()->split("\n")[1])
+ \ lines[index])
" character with K_SPECIAL byte in rhs
nmap foo …
diff --git a/src/version.c b/src/version.c
index a5855b81fa..7ee612d589 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 796,
+/**/
795,
/**/
794,