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

Linting.

Browse Source
This commit is contained in:
KillTheMule
2016-04-23 23:00:59 +02:00
parent 445f0d7eed
commit 23e8d6d94b
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/ex_cmds2.c
View File

@@ -2373,8 +2373,9 @@ static FILE *fopen_noinh_readbin(char *filename)
# ifdef HAVE_FD_CLOEXEC # ifdef HAVE_FD_CLOEXEC
{ {
int fdflags = fcntl(fd_tmp, F_GETFD); int fdflags = fcntl(fd_tmp, F_GETFD);
if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) {
(void)fcntl(fd_tmp, F_SETFD, fdflags | FD_CLOEXEC); (void)fcntl(fd_tmp, F_SETFD, fdflags | FD_CLOEXEC);
}
} }
# endif # endif

13
src/nvim/fold.c
View File

@@ -2112,8 +2112,9 @@ static linenr_T foldUpdateIEMSRecurse(garray_T *gap, int level,
&& flp->lvl > 0) { && flp->lvl > 0) {
(void)foldFind(gap, startlnum - 1, &fp); (void)foldFind(gap, startlnum - 1, &fp);
if (fp >= ((fold_T *)gap->ga_data) + gap->ga_len if (fp >= ((fold_T *)gap->ga_data) + gap->ga_len
|| fp->fd_top >= startlnum) || fp->fd_top >= startlnum) {
fp = NULL; fp = NULL;
}
} }
/* /*
@@ -2168,12 +2169,14 @@ static linenr_T foldUpdateIEMSRecurse(garray_T *gap, int level,
} }
if (lvl < level + i) { if (lvl < level + i) {
(void)foldFind(&fp->fd_nested, flp->lnum - fp->fd_top, &fp2); (void)foldFind(&fp->fd_nested, flp->lnum - fp->fd_top, &fp2);
if (fp2 != NULL) if (fp2 != NULL) {
bot = fp2->fd_top + fp2->fd_len - 1 + fp->fd_top; bot = fp2->fd_top + fp2->fd_len - 1 + fp->fd_top;
} else if (fp->fd_top + fp->fd_len <= flp->lnum && lvl >= level) }
finish = TRUE; } else if (fp->fd_top + fp->fd_len <= flp->lnum && lvl >= level) {
else finish = true;
} else {
break; break;
}
} }
/* At the start of the first nested fold and at the end of the current /* At the start of the first nested fold and at the end of the current

2
src/nvim/if_cscope.c
View File

@@ -1063,7 +1063,7 @@ static int cs_find_common(char *opt, char *pat, int forceit, int verbose,
*qfpos == '-', cmdline) > 0) { *qfpos == '-', cmdline) > 0) {
if (postponed_split != 0) { if (postponed_split != 0) {
(void)win_split(postponed_split > 0 ? postponed_split : 0, (void)win_split(postponed_split > 0 ? postponed_split : 0,
postponed_split_flags); postponed_split_flags);
RESET_BINDING(curwin); RESET_BINDING(curwin);
postponed_split = 0; postponed_split = 0;
} }

10
src/nvim/normal.c
View File

@@ -2599,8 +2599,9 @@ do_mouse (
else else
end_visual.col = rightcol; end_visual.col = rightcol;
if (curwin->w_cursor.lnum >= if (curwin->w_cursor.lnum >=
(start_visual.lnum + end_visual.lnum) / 2) (start_visual.lnum + end_visual.lnum) / 2) {
end_visual.lnum = start_visual.lnum; end_visual.lnum = start_visual.lnum;
}
/* move VIsual to the right column */ /* move VIsual to the right column */
start_visual = curwin->w_cursor; /* save the cursor pos */ start_visual = curwin->w_cursor; /* save the cursor pos */
@@ -3242,7 +3243,7 @@ void clear_showcmd(void)
top = curwin->w_cursor.lnum; top = curwin->w_cursor.lnum;
bot = VIsual.lnum; bot = VIsual.lnum;
} }
/* Include closed folds as a whole. */ // Include closed folds as a whole.
(void)hasFolding(top, &top, NULL); (void)hasFolding(top, &top, NULL);
(void)hasFolding(bot, NULL, &bot); (void)hasFolding(bot, NULL, &bot);
lines = bot - top + 1; lines = bot - top + 1;
@@ -5150,9 +5151,10 @@ static void nv_gotofile(cmdarg_T *cap)
ptr = grab_file_name(cap->count1, &lnum); ptr = grab_file_name(cap->count1, &lnum);
if (ptr != NULL) { if (ptr != NULL) {
/* do autowrite if necessary */ // do autowrite if necessary
if (curbufIsChanged() && curbuf->b_nwindows <= 1 && !P_HID(curbuf)) if (curbufIsChanged() && curbuf->b_nwindows <= 1 && !P_HID(curbuf)) {
(void)autowrite(curbuf, false); (void)autowrite(curbuf, false);
}
setpcmark(); setpcmark();
(void)do_ecmd(0, ptr, NULL, NULL, ECMD_LAST, (void)do_ecmd(0, ptr, NULL, NULL, ECMD_LAST,
P_HID(curbuf) ? ECMD_HIDE : 0, curwin); P_HID(curbuf) ? ECMD_HIDE : 0, curwin);