Merge #7966 'vim-patch:8.0.0470,8.0.0471'

This commit is contained in:
Justin M. Keyes 2018-02-12 00:55:56 +01:00
commit 418947fcb3
2 changed files with 57 additions and 0 deletions

View File

@ -227,6 +227,7 @@ endif
" Names of flaky tests.
let s:flaky = [
\ 'Test_exit_callback_interval()',
\ 'Test_oneshot()',
\ 'Test_out_cb()',
\ 'Test_paused()',

View File

@ -18,6 +18,52 @@ func Test_help_tagjump()
call assert_true(getline('.') =~ '\*help.txt\*')
helpclose
help |
call assert_equal("help", &filetype)
call assert_true(getline('.') =~ '\*bar\*')
helpclose
help "*
call assert_equal("help", &filetype)
call assert_true(getline('.') =~ '\*quotestar\*')
helpclose
help sp?it
call assert_equal("help", &filetype)
call assert_true(getline('.') =~ '\*:split\*')
helpclose
help :?
call assert_equal("help", &filetype)
call assert_true(getline('.') =~ '\*:?\*')
helpclose
help FileW*Post
call assert_equal("help", &filetype)
call assert_true(getline('.') =~ '\*FileWritePost\*')
helpclose
help `ls`
call assert_equal("help", &filetype)
call assert_true(getline('.') =~ '\*:ls\*')
helpclose
help ^X
call assert_equal("help", &filetype)
call assert_true(getline('.') =~ '\*CTRL-X\*')
helpclose
help i_^_CTRL-D
call assert_equal("help", &filetype)
call assert_true(getline('.') =~ '\*i_^_CTRL-D\*')
helpclose
exec "help \<C-V>"
call assert_equal("help", &filetype)
call assert_true(getline('.') =~ '\*CTRL-V\*')
helpclose
exec "help! ('textwidth'"
call assert_equal("help", &filetype)
call assert_true(getline('.') =~ "\\*'textwidth'\\*")
@ -47,6 +93,16 @@ func Test_help_tagjump()
call assert_equal("help", &filetype)
call assert_true(getline('.') =~ '\*{address}\*')
helpclose
exusage
call assert_equal("help", &filetype)
call assert_true(getline('.') =~ '\*:index\*')
helpclose
viusage
call assert_equal("help", &filetype)
call assert_true(getline('.') =~ '\*normal-index\*')
helpclose
endfunc
let s:langs = ['en', 'ab', 'ja']