diff options
| author | Michael Ennen <mike.ennen@gmail.com> | 2016-11-26 16:17:39 -0700 |
|---|---|---|
| committer | Michael Ennen <mike.ennen@gmail.com> | 2016-11-26 16:17:39 -0700 |
| commit | 68271a6d1993331b22242f87ecca6f60565c9517 (patch) | |
| tree | 594efd55396a58aceb31aedc29ad05065fc388b9 /src/nvim/testdir | |
| parent | 7be113d7959df83bdec1e4d9a3e98264bc5d7a5b (diff) | |
| download | rneovim-68271a6d1993331b22242f87ecca6f60565c9517.tar.gz rneovim-68271a6d1993331b22242f87ecca6f60565c9517.tar.bz2 rneovim-68271a6d1993331b22242f87ecca6f60565c9517.zip | |
vim-patch:7.4.1723
Problem: When using try/catch in 'tabline' it is still considered an
error and the tabline will be disabled.
Solution: Check did_emsg instead of called_emsg. (haya14busa, closes #746)
https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Diffstat (limited to 'src/nvim/testdir')
| -rw-r--r-- | src/nvim/testdir/test_alot.vim | 1 | ||||
| -rw-r--r-- | src/nvim/testdir/test_tabline.vim | 43 |
2 files changed, 44 insertions, 0 deletions
diff --git a/src/nvim/testdir/test_alot.vim b/src/nvim/testdir/test_alot.vim index 4e8cd54ce3..4408dfc734 100644 --- a/src/nvim/testdir/test_alot.vim +++ b/src/nvim/testdir/test_alot.vim @@ -13,6 +13,7 @@ source test_options.vim source test_popup.vim source test_regexp_utf8.vim source test_syn_attr.vim +source test_tabline.vim source test_tabpage.vim source test_unlet.vim source test_matchadd_conceal_utf8.vim diff --git a/src/nvim/testdir/test_tabline.vim b/src/nvim/testdir/test_tabline.vim new file mode 100644 index 0000000000..6c7a02d650 --- /dev/null +++ b/src/nvim/testdir/test_tabline.vim @@ -0,0 +1,43 @@ +function! TablineWithCaughtError() + let s:func_in_tabline_called = 1 + try + call eval('unknown expression') + catch + endtry + return '' +endfunction + +function! TablineWithError() + let s:func_in_tabline_called = 1 + call eval('unknown expression') + return '' +endfunction + +function! Test_caught_error_in_tabline() + let showtabline_save = &showtabline + set showtabline=2 + let s:func_in_tabline_called = 0 + let tabline = '%{TablineWithCaughtError()}' + let &tabline = tabline + redraw! + call assert_true(s:func_in_tabline_called) + call assert_equal(tabline, &tabline) + set tabline= + let &showtabline = showtabline_save +endfunction + +function! Test_tabline_will_be_disabled_with_error() + let showtabline_save = &showtabline + set showtabline=2 + let s:func_in_tabline_called = 0 + let tabline = '%{TablineWithError()}' + try + let &tabline = tabline + redraw! + catch + endtry + call assert_true(s:func_in_tabline_called) + call assert_equal('', &tabline) + set tabline= + let &showtabline = showtabline_save +endfunction |