Permalink
Browse files

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 #729)
  • Loading branch information...
1 parent 17fe5e1 commit a742e084b677f76c67e9e52c4f9fb9ab24002e20 @brammool brammool committed Apr 5, 2016
Showing with 46 additions and 4 deletions.
  1. +4 −4 src/screen.c
  2. +1 −0 src/testdir/test_alot.vim
  3. +39 −0 src/testdir/test_statusline.vim
  4. +2 −0 src/version.c
View
@@ -6779,17 +6779,17 @@ 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. */
if (entered)
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
@@ -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
@@ -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
View
@@ -749,6 +749,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1711,
+/**/
1710,
/**/
1709,

0 comments on commit a742e08

Please sign in to comment.