Mercurial > vim
changeset 8847:470ea7526cc6 v7.4.1711
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Apr 5 21:10:38 2016 +0200
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 https://github.com/vim/vim/issues/729)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 05 Apr 2016 21:15:05 +0200 |
| parents | 2dd1060c5155 |
| children | b770e57bb8e6 |
| files | src/screen.c src/testdir/test_alot.vim src/testdir/test_statusline.vim src/version.c |
| diffstat | 4 files changed, 46 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/screen.c +++ b/src/screen.c @@ -6779,7 +6779,7 @@ win_redr_status(win_T *wp) redraw_custom_statusline(win_T *wp) { static int entered = FALSE; - int save_called_emsg = called_emsg; + int saved_did_emsg = did_emsg; /* When called recursively return. This can happen when the statusline * contains an expression that triggers a redraw. */ @@ -6787,9 +6787,9 @@ redraw_custom_statusline(win_T *wp) return; entered = TRUE; - called_emsg = FALSE; + did_emsg = FALSE; win_redr_custom(wp, FALSE); - if (called_emsg) + if (did_emsg) { /* When there is an error disable the statusline, otherwise the * display is messed up with errors and a redraw triggers the problem @@ -6798,7 +6798,7 @@ redraw_custom_statusline(win_T *wp) (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); } - called_emsg |= save_called_emsg; + did_emsg |= saved_did_emsg; entered = FALSE; } #endif
--- a/src/testdir/test_alot.vim +++ b/src/testdir/test_alot.vim @@ -22,6 +22,7 @@ source test_reltime.vim source test_searchpos.vim source test_set.vim source test_sort.vim +source test_statusline.vim source test_syn_attr.vim source test_timers.vim source test_undolevels.vim
new file mode 100644 --- /dev/null +++ b/src/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