mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-01 07:28:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

*: Fix linter errors

Browse Source
This commit is contained in:
ZyX
2017-04-16 22:20:19 +03:00
parent 9d302c60f0
commit 58300d70d2
4 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/eval.c
View File

@@ -2742,11 +2742,12 @@ void ex_call(exarg_T *eap)
* call, and the loop is broken. * call, and the loop is broken.
*/ */
if (eap->skip) { if (eap->skip) {
++emsg_skip; emsg_skip++;
lnum = eap->line2; /* do it once, also with an invalid range */ lnum = eap->line2; // Do it once, also with an invalid range.
} else } else {
lnum = eap->line1; lnum = eap->line1;
for (; lnum <= eap->line2; ++lnum) { }
for (; lnum <= eap->line2; lnum++) {
if (!eap->skip && eap->addr_count > 0) { // -V560 if (!eap->skip && eap->addr_count > 0) { // -V560
curwin->w_cursor.lnum = lnum; curwin->w_cursor.lnum = lnum;
curwin->w_cursor.col = 0; curwin->w_cursor.col = 0;

3
src/nvim/ex_docmd.c
View File

@@ -4095,8 +4095,7 @@ int expand_filename(exarg_T *eap, char_u **cmdlinep, char_u **errormsgp)
xpc.xp_context = EXPAND_FILES; xpc.xp_context = EXPAND_FILES;
if (p_wic) if (p_wic)
options += WILD_ICASE; options += WILD_ICASE;
p = ExpandOne(&xpc, eap->arg, NULL, p = ExpandOne(&xpc, eap->arg, NULL, options, WILD_EXPAND_FREE);
options, WILD_EXPAND_FREE);
if (p == NULL) { if (p == NULL) {
return FAIL; return FAIL;
} }

6
src/nvim/normal.c
View File

@@ -2333,9 +2333,9 @@ do_mouse (
if (regname == 0 && eval_has_provider("clipboard")) { if (regname == 0 && eval_has_provider("clipboard")) {
regname = '*'; regname = '*';
} }
if ((State & REPLACE_FLAG) && !yank_register_mline(regname)) if ((State & REPLACE_FLAG) && !yank_register_mline(regname)) {
insert_reg(regname, true); insert_reg(regname, true);
else { } else {
do_put(regname, NULL, BACKWARD, 1L, do_put(regname, NULL, BACKWARD, 1L,
(fixindent ? PUT_FIXINDENT : 0) | PUT_CURSEND); (fixindent ? PUT_FIXINDENT : 0) | PUT_CURSEND);
@@ -7616,7 +7616,7 @@ static void nv_record(cmdarg_T *cap)
} else { } else {
// (stop) recording into a named register, unless executing a // (stop) recording into a named register, unless executing a
// register. // register.
if (!Exec_reg && do_record(cap->nchar) == false) { if (!Exec_reg && do_record(cap->nchar) == FAIL) {
clearopbeep(cap->oap); clearopbeep(cap->oap);
} }
} }

8
src/nvim/screen.c
View File

@@ -1017,11 +1017,9 @@ static void win_update(win_T *wp)
if (VIsual_active) { if (VIsual_active) {
if (VIsual_mode != wp->w_old_visual_mode || type == INVERTED_ALL) { if (VIsual_mode != wp->w_old_visual_mode || type == INVERTED_ALL) {
/* // If the type of Visual selection changed, redraw the whole
* If the type of Visual selection changed, redraw the whole // selection. Also when the ownership of the X selection is
* selection. Also when the ownership of the X selection is // gained or lost.
* gained or lost.
*/
if (curwin->w_cursor.lnum < VIsual.lnum) { if (curwin->w_cursor.lnum < VIsual.lnum) {
from = curwin->w_cursor.lnum; from = curwin->w_cursor.lnum;
to = VIsual.lnum; to = VIsual.lnum;