summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-08-16 20:56:03 +0200
committerBram Moolenaar <Bram@vim.org>2019-08-16 20:56:03 +0200
commit2f710afe7f166973c879bf7424678ba84368c1bb (patch)
tree2b5f1cc36fd412bbcf42579e9bc2c8e74175e454
parentc8fd33d18b49c3246f33782dd7b4a1c87504dd5f (diff)
patch 8.1.1858: test for multi-byte mapping fails on some systemsv8.1.1858
Problem: Test for multi-byte mapping fails on some systems. Solution: Test in another way.
-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,