diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-12-01 09:01:55 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2016-12-01 09:01:55 -0500 |
| commit | e1cdf04f2db49f987bc4108e5fa4e1dd45339b7b (patch) | |
| tree | d655f491402623d06bff1b68329eb9197af545ad /src/nvim/screen.c | |
| parent | d2e8c76dc22460ddfde80477dd93aab3d5866506 (diff) | |
| parent | 22c7dbd5f886a5ec116a6863bb527d99f5152eeb (diff) | |
| download | rneovim-e1cdf04f2db49f987bc4108e5fa4e1dd45339b7b.tar.gz rneovim-e1cdf04f2db49f987bc4108e5fa4e1dd45339b7b.tar.bz2 rneovim-e1cdf04f2db49f987bc4108e5fa4e1dd45339b7b.zip | |
Merge pull request #5665 from brcolow/vim-7.4.1711
vim-patch:7.4.1711
Diffstat (limited to 'src/nvim/screen.c')
| -rw-r--r-- | src/nvim/screen.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 5bf743c4df..a851cd5ed1 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -4939,8 +4939,8 @@ void win_redr_status(win_T *wp) */ static void redraw_custom_statusline(win_T *wp) { - static int entered = FALSE; - int save_called_emsg = called_emsg; + static int entered = false; + int saved_did_emsg = did_emsg; /* When called recursively return. This can happen when the statusline * contains an expression that triggers a redraw. */ @@ -4948,18 +4948,18 @@ static void redraw_custom_statusline(win_T *wp) return; entered = TRUE; - called_emsg = FALSE; - win_redr_custom(wp, FALSE); - if (called_emsg) { - /* When there is an error disable the statusline, otherwise the - * display is messed up with errors and a redraw triggers the problem - * again and again. */ + did_emsg = false; + win_redr_custom(wp, false); + 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 + // again and again. set_string_option_direct((char_u *)"statusline", -1, (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); } - called_emsg |= save_called_emsg; - entered = FALSE; + did_emsg |= saved_did_emsg; + entered = false; } /* |