diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-12-01 09:07:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-01 09:07:33 -0500 |
| commit | 85f9f9f46dfc53966621c87442eed3528fb92c26 (patch) | |
| tree | 24f7a012dd28fd14e0ffaa476900b1f1a3f5d9d8 /src/nvim/screen.c | |
| parent | e1cdf04f2db49f987bc4108e5fa4e1dd45339b7b (diff) | |
| parent | 68271a6d1993331b22242f87ecca6f60565c9517 (diff) | |
| download | rneovim-85f9f9f46dfc53966621c87442eed3528fb92c26.tar.gz rneovim-85f9f9f46dfc53966621c87442eed3528fb92c26.tar.bz2 rneovim-85f9f9f46dfc53966621c87442eed3528fb92c26.zip | |
Merge pull request #5674 from brcolow/vim-7.4.1723
vim-patch:7.4.1723
Diffstat (limited to 'src/nvim/screen.c')
| -rw-r--r-- | src/nvim/screen.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index a851cd5ed1..9075f94a20 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -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; |