mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-15 06:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-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)

f73d3bc253
This commit is contained in:
Michael Ennen
2016-11-26 16:17:39 -07:00
parent 7be113d795
commit 68271a6d19
4 changed files with 54 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/nvim/screen.c
View File

@@ -6888,16 +6888,17 @@ static void 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;
win_redr_custom(NULL, FALSE);
if (called_emsg)
// Check for an error. If there is one we would loop in redrawing the
// screen. Avoid that by making 'tabline' empty.
did_emsg = false;
win_redr_custom(NULL, false);
if (did_emsg) {
set_string_option_direct((char_u *)"tabline", -1,
(char_u *)"", OPT_FREE, SID_ERROR);
called_emsg |= save_called_emsg;
(char_u *)"", OPT_FREE, SID_ERROR);
}
did_emsg |= saved_did_emsg;
} else {
FOR_ALL_TABS(tp) {
++tabcount;