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

patch 7.4.1723

Browse Source 
Problem:    When using try/catch in 'tabline' it is still considered an
            error and the tabline will be disabled.
Solution:   Check did_emsg instead of called_emsg. (haya14busa, closes #746)
This commit is contained in:
Bram Moolenaar
2016-04-11 21:55:15 +02:00
parent 0239acb11f
commit f73d3bc253
4 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/screen.c
View File

@@ -10266,16 +10266,16 @@ draw_tabline(void)
/* Use the 'tabline' option if it's set. */
if (*p_tal != NUL)
{
int save_called_emsg = called_emsg;
int saved_did_emsg = did_emsg;
/* Check for an error. If there is one we would loop in redrawing the
* screen. Avoid that by making 'tabline' empty. */
called_emsg = FALSE;
did_emsg = FALSE;
win_redr_custom(NULL, FALSE);
if (called_emsg)
if (did_emsg)
set_string_option_direct((char_u *)"tabline", -1,
(char_u *)"", OPT_FREE, SID_ERROR);
called_emsg |= save_called_emsg;
did_emsg |= saved_did_emsg;
}
else
#endif