From 4aa3473b8800df64aeec25012976e603ac66c9f6 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Fri, 16 Aug 2019 21:15:33 -0400 Subject: vim-patch:8.1.1857: cannot use modifier with multi-byte character Problem: Cannot use modifier with multi-byte character. Solution: Allow using a multi-byte character, although it doesn't work everywhere. https://github.com/vim/vim/commit/c8fd33d18b49c3246f33782dd7b4a1c87504dd5f --- src/nvim/testdir/test_mapping.vim | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/nvim/testdir/test_mapping.vim b/src/nvim/testdir/test_mapping.vim index 9f253604ed..43bab8ae5c 100644 --- a/src/nvim/testdir/test_mapping.vim +++ b/src/nvim/testdir/test_mapping.vim @@ -229,6 +229,12 @@ func Test_map_meta_quotes() iunmap endfunc +func Test_map_meta_multibyte() + imap foo + call assert_equal('foo', maparg("\", 'i')) + iunmap +endfunc + func Test_abbr_after_line_join() new abbr foo bar @@ -282,7 +288,7 @@ func Test_map_timeout_with_timer_interrupt() let g:val = 0 nnoremap \12 :let g:val = 1 nnoremap \123 :let g:val = 2 - set timeout timeoutlen=1000 + set timeout timeoutlen=100 func ExitCb(job, status) let g:timer = timer_start(1, {_ -> feedkeys("3\", 't')}) -- cgit From 0455af00e656b0f18854211e4547221178d64af8 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Fri, 16 Aug 2019 21:20:45 -0400 Subject: vim-patch:8.1.1858: test for multi-byte mapping fails on some systems Problem: Test for multi-byte mapping fails on some systems. Solution: Test in another way. https://github.com/vim/vim/commit/2f710afe7f166973c879bf7424678ba84368c1bb --- src/nvim/testdir/test_mapping.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/nvim/testdir/test_mapping.vim b/src/nvim/testdir/test_mapping.vim index 43bab8ae5c..5e080fc55e 100644 --- a/src/nvim/testdir/test_mapping.vim +++ b/src/nvim/testdir/test_mapping.vim @@ -231,7 +231,7 @@ endfunc func Test_map_meta_multibyte() imap foo - call assert_equal('foo', maparg("\", 'i')) + call assert_match('i \s*foo', execute('imap')) iunmap endfunc -- cgit From ae95a62675c00dd3869d31964cdbb1ce284a3075 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Fri, 16 Aug 2019 21:22:16 -0400 Subject: vim-patch:8.1.1860: map timeout test is flaky Problem: Map timeout test is flaky. Solution: Add test to list of flaky tests. Increase timeout. https://github.com/vim/vim/commit/ea94c855163cf58a3389b5f3c54a0767c9e1be49 --- src/nvim/testdir/runtest.vim | 1 + src/nvim/testdir/test_mapping.vim | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim index ce7d3b7ee4..4eddad8ad5 100644 --- a/src/nvim/testdir/runtest.vim +++ b/src/nvim/testdir/runtest.vim @@ -280,6 +280,7 @@ endif let s:flaky_tests = [ \ 'Test_cursorhold_insert()', \ 'Test_exit_callback_interval()', + \ 'Test_map_timeout_with_timer_interrupt()', \ 'Test_oneshot()', \ 'Test_out_cb()', \ 'Test_paused()', diff --git a/src/nvim/testdir/test_mapping.vim b/src/nvim/testdir/test_mapping.vim index 5e080fc55e..7fdb3324ce 100644 --- a/src/nvim/testdir/test_mapping.vim +++ b/src/nvim/testdir/test_mapping.vim @@ -288,7 +288,7 @@ func Test_map_timeout_with_timer_interrupt() let g:val = 0 nnoremap \12 :let g:val = 1 nnoremap \123 :let g:val = 2 - set timeout timeoutlen=100 + set timeout timeoutlen=200 func ExitCb(job, status) let g:timer = timer_start(1, {_ -> feedkeys("3\", 't')}) -- cgit