diff options
| author | Michael Ennen <mike.ennen@gmail.com> | 2016-11-24 23:59:10 -0700 |
|---|---|---|
| committer | Michael Ennen <mike.ennen@gmail.com> | 2016-11-25 18:23:36 -0700 |
| commit | 22c7dbd5f886a5ec116a6863bb527d99f5152eeb (patch) | |
| tree | b5e65a07c4c0cce50b1146472477b2faa70fbfbf /src/nvim/testdir | |
| parent | 5f0260808cf3712718555ee177476b8aefd78280 (diff) | |
| download | rneovim-22c7dbd5f886a5ec116a6863bb527d99f5152eeb.tar.gz rneovim-22c7dbd5f886a5ec116a6863bb527d99f5152eeb.tar.bz2 rneovim-22c7dbd5f886a5ec116a6863bb527d99f5152eeb.zip | |
vim-patch:7.4.1711
Problem: When using try/catch in 'statusline' it is still considered an
error and the status line will be disabled.
Solution: Check did_emsg instead of called_emsg. (haya14busa, closes vim/vim#729)
https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
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 156604051d..dacea81a34 100644 --- a/src/nvim/testdir/test_alot.vim +++ b/src/nvim/testdir/test_alot.vim @@ -13,6 +13,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 |