thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.1711

Browse Source 
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)
This commit is contained in:
Bram Moolenaar
2016-04-05 21:10:38 +02:00
parent 17fe5e1aec
commit a742e084b6
4 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/screen.c
View File

@@ -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