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

fix lint

Browse Source
This commit is contained in:
ckelsel
2017-07-24 07:41:01 +08:00
parent b656159fcf
commit 86f2c473dc
3 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/nvim/buffer.c
View File

@@ -1204,7 +1204,7 @@ do_buffer (
while (buf == curbuf
&& !(curwin->w_closing || curwin->w_buffer->b_locked > 0)
&& (!ONE_WINDOW || first_tabpage->tp_next != NULL)) {
if (win_close(curwin, FALSE) == FAIL)
if (win_close(curwin, false) == FAIL)
break;
}
@@ -4428,15 +4428,17 @@ do_arg_all (
continue;
}
}
/* don't close last window */
// don't close last window
if (ONE_WINDOW
&& (first_tabpage->tp_next == NULL || !had_tab))
use_firstwin = TRUE;
else {
&& (first_tabpage->tp_next == NULL || !had_tab)) {
use_firstwin = true;
} else {
win_close(wp, !P_HID(buf) && !bufIsChanged(buf));
/* check if autocommands removed the next window */
if (!win_valid(wpnext))
wpnext = firstwin; /* start all over... */
// check if autocommands removed the next window
if (!win_valid(wpnext)) {
// start all over...
wpnext = firstwin;
}
}
}
}

14
src/nvim/ex_cmds.c
View File

@@ -2802,16 +2802,18 @@ void ex_z(exarg_T *eap)
int j;
linenr_T lnum = eap->line2;
/* Vi compatible: ":z!" uses display height, without a count uses
* 'scroll' */
if (eap->forceit)
// Vi compatible: ":z!" uses display height, without a count uses
// 'scroll'
if (eap->forceit) {
bigness = curwin->w_height;
else if (ONE_WINDOW)
} else if (ONE_WINDOW) {
bigness = curwin->w_p_scr * 2;
else
} else {
bigness = curwin->w_height - 3;
if (bigness < 1)
}
if (bigness < 1) {
bigness = 1;
}
x = eap->arg;
kind = x;

12
src/nvim/ex_docmd.c
View File

@@ -6174,13 +6174,15 @@ static void ex_tabonly(exarg_T *eap)
*/
void tabpage_close(int forceit)
{
/* First close all the windows but the current one. If that worked then
* close the last window in this tab, that will close it. */
if (!ONE_WINDOW)
close_others(TRUE, forceit);
if (ONE_WINDOW)
// First close all the windows but the current one. If that worked then
// close the last window in this tab, that will close it.
if (!ONE_WINDOW) {
close_others(true, forceit);
}
if (ONE_WINDOW) {
ex_win_close(forceit, curwin, NULL);
}
}
/*
* Close tab page "tp", which is not the current tab page.