diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-12-01 09:01:55 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2016-12-01 09:01:55 -0500 |
| commit | e1cdf04f2db49f987bc4108e5fa4e1dd45339b7b (patch) | |
| tree | d655f491402623d06bff1b68329eb9197af545ad /src/nvim/testdir | |
| parent | d2e8c76dc22460ddfde80477dd93aab3d5866506 (diff) | |
| parent | 22c7dbd5f886a5ec116a6863bb527d99f5152eeb (diff) | |
| download | rneovim-e1cdf04f2db49f987bc4108e5fa4e1dd45339b7b.tar.gz rneovim-e1cdf04f2db49f987bc4108e5fa4e1dd45339b7b.tar.bz2 rneovim-e1cdf04f2db49f987bc4108e5fa4e1dd45339b7b.zip | |
Merge pull request #5665 from brcolow/vim-7.4.1711
vim-patch:7.4.1711
Diffstat (limited to 'src/nvim/testdir')
| -rw-r--r-- | src/nvim/testdir/test_alot.vim | 1 | ||||
| -rw-r--r-- | src/nvim/testdir/test_statusline.vim | 39 |
2 files changed, 40 insertions, 0 deletions
diff --git a/src/nvim/testdir/test_alot.vim b/src/nvim/testdir/test_alot.vim index 4e8cd54ce3..d75430ed8d 100644 --- a/src/nvim/testdir/test_alot.vim +++ b/src/nvim/testdir/test_alot.vim @@ -12,6 +12,7 @@ source test_menu.vim source test_options.vim source test_popup.vim source test_regexp_utf8.vim +source test_statusline.vim source test_syn_attr.vim source test_tabpage.vim source test_unlet.vim diff --git a/src/nvim/testdir/test_statusline.vim b/src/nvim/testdir/test_statusline.vim new file mode 100644 index 0000000000..82898df92d --- /dev/null +++ b/src/nvim/testdir/test_statusline.vim @@ -0,0 +1,39 @@ +function! StatuslineWithCaughtError() + let s:func_in_statusline_called = 1 + try + call eval('unknown expression') + catch + endtry + return '' +endfunction + +function! StatuslineWithError() + let s:func_in_statusline_called = 1 + call eval('unknown expression') + return '' +endfunction + +function! Test_caught_error_in_statusline() + let s:func_in_statusline_called = 0 + set laststatus=2 + let statusline = '%{StatuslineWithCaughtError()}' + let &statusline = statusline + redrawstatus + call assert_true(s:func_in_statusline_called) + call assert_equal(statusline, &statusline) + set statusline= +endfunction + +function! Test_statusline_will_be_disabled_with_error() + let s:func_in_statusline_called = 0 + set laststatus=2 + let statusline = '%{StatuslineWithError()}' + try + let &statusline = statusline + redrawstatus + catch + endtry + call assert_true(s:func_in_statusline_called) + call assert_equal('', &statusline) + set statusline= +endfunction |