diff options
| author | Daniel Hahler <git@thequod.de> | 2017-12-29 21:13:21 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-12-30 22:49:50 +0100 |
| commit | 46f432074e739a0eca9bb204e9c7769935669dbd (patch) | |
| tree | dfe1a7953a75aaf7e0e10dcc1571dcbc15119c33 /src | |
| parent | a30242d661b16197328859c50e609862011c9d48 (diff) | |
| download | rneovim-46f432074e739a0eca9bb204e9c7769935669dbd.tar.gz rneovim-46f432074e739a0eca9bb204e9c7769935669dbd.tar.bz2 rneovim-46f432074e739a0eca9bb204e9c7769935669dbd.zip | |
tests: termclose_spec: fix flaky SIGTERM test #7787
Followup to https://github.com/neovim/neovim/pull/7217.
Build failure: https://travis-ci.org/neovim/neovim/jobs/322930672#L2958.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/window.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c index 2e1507c0ee..b687781dfb 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -2104,25 +2104,26 @@ void win_close_othertab(win_T *win, int free_buf, tabpage_T *tp) if (tp->tp_firstwin == tp->tp_lastwin) { char_u prev_idx[NUMBUFLEN]; if (has_event(EVENT_TABCLOSED)) { - vim_snprintf((char *)prev_idx, NUMBUFLEN, "%i", tabpage_index(tp)); + vim_snprintf((char *)prev_idx, NUMBUFLEN, "%i", tabpage_index(tp)); } - if (tp == first_tabpage) + if (tp == first_tabpage) { first_tabpage = tp->tp_next; - else { + } else { for (ptp = first_tabpage; ptp != NULL && ptp->tp_next != tp; - ptp = ptp->tp_next) - ; + ptp = ptp->tp_next) { + // loop + } if (ptp == NULL) { internal_error("win_close_othertab()"); return; } ptp->tp_next = tp->tp_next; } - free_tp = TRUE; + free_tp = true; if (has_event(EVENT_TABCLOSED)) { - apply_autocmds(EVENT_TABCLOSED, prev_idx, prev_idx, false, win->w_buffer); + apply_autocmds(EVENT_TABCLOSED, prev_idx, prev_idx, false, win->w_buffer); } } |