summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_mapping.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim
index b189296b53..6b9fb9ca1a 100644
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -241,7 +241,7 @@ endfunc
func Test_map_meta_multibyte()
imap <M-á> foo
- call assert_equal('foo', maparg("\<M-á>", 'i'))
+ call assert_match('i <M-á>\s*foo', execute('imap'))
iunmap <M-á>
endfunc
diff --git a/src/version.c b/src/version.c
index 5bd944dfc1..ee4bb90e5f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1858,
+/**/
1857,
/**/
1856,