IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge #10794 from janlazo/vim-8.1.1857

Browse Source 
vim-patch:8.1.{1857,1858,1860}
This commit is contained in:
Justin M. Keyes 2019-08-17 08:49:05 +02:00 committed by GitHub
commit e2ccf47b5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/nvim/testdir/runtest.vim
View File

@ -280,6 +280,7 @@ endif
let s:flaky_tests = [ let s:flaky_tests = [
\ 'Test_cursorhold_insert()', \ 'Test_cursorhold_insert()',
\ 'Test_exit_callback_interval()', \ 'Test_exit_callback_interval()',
\ 'Test_map_timeout_with_timer_interrupt()',
\ 'Test_oneshot()', \ 'Test_oneshot()',
\ 'Test_out_cb()', \ 'Test_out_cb()',
\ 'Test_paused()', \ 'Test_paused()',

8
src/nvim/testdir/test_mapping.vim
View File

@ -229,6 +229,12 @@ func Test_map_meta_quotes()
iunmap <M-"> iunmap <M-">
endfunc 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() func Test_abbr_after_line_join()
new new
abbr foo bar abbr foo bar
@ -282,7 +288,7 @@ func Test_map_timeout_with_timer_interrupt()
let g:val = 0 let g:val = 0
nnoremap \12 :let g:val = 1<CR> nnoremap \12 :let g:val = 1<CR>
nnoremap \123 :let g:val = 2<CR> nnoremap \123 :let g:val = 2<CR>
set timeout timeoutlen=1000 set timeout timeoutlen=200
func ExitCb(job, status) func ExitCb(job, status)
let g:timer = timer_start(1, {_ -> feedkeys("3\<Esc>", 't')}) let g:timer = timer_start(1, {_ -> feedkeys("3\<Esc>", 't')})