diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-08-17 08:49:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-17 08:49:05 +0200 |
| commit | e2ccf47b5e5e5acf19a74d928e367c7726d29ad3 (patch) | |
| tree | 152e09e50ce83e028fcd435aad54b773840325df /src | |
| parent | e56f62e9a7ba9ca2be7f86451390b25897b02a91 (diff) | |
| parent | ae95a62675c00dd3869d31964cdbb1ce284a3075 (diff) | |
| download | rneovim-e2ccf47b5e5e5acf19a74d928e367c7726d29ad3.tar.gz rneovim-e2ccf47b5e5e5acf19a74d928e367c7726d29ad3.tar.bz2 rneovim-e2ccf47b5e5e5acf19a74d928e367c7726d29ad3.zip | |
Merge #10794 from janlazo/vim-8.1.1857
vim-patch:8.1.{1857,1858,1860}
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/runtest.vim | 1 | ||||
| -rw-r--r-- | src/nvim/testdir/test_mapping.vim | 8 |
2 files changed, 8 insertions, 1 deletions
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 9f253604ed..7fdb3324ce 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 <M-"> endfunc +func Test_map_meta_multibyte() + imap <M-á> foo + call assert_match('i <M-á>\s*foo', execute('imap')) + iunmap <M-á> +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<CR> nnoremap \123 :let g:val = 2<CR> - set timeout timeoutlen=1000 + set timeout timeoutlen=200 func ExitCb(job, status) let g:timer = timer_start(1, {_ -> feedkeys("3\<Esc>", 't')}) |