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)
diff --git a/src/screen.c b/src/screen.c
index 4c2b70c..dc5d175 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -6779,7 +6779,7 @@
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 @@
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 @@
(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