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

lint

Browse Source
This commit is contained in:
Justin M. Keyes
2018-02-11 19:02:57 +01:00
parent 22173a64dd
commit f26a4d484b
5 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/ex_getln.c
View File

@@ -1056,8 +1056,7 @@ static void command_line_next_incsearch(CommandLineState *s, bool next_match)
// put back on the match // put back on the match
s->search_start = t; s->search_start = t;
(void)decl(&s->search_start); (void)decl(&s->search_start);
} } else if (next_match && s->firstc == '?') {
else if (next_match && s->firstc == '?') {
// move just after the current match, so that // move just after the current match, so that
// when nv_search finishes the cursor will be // when nv_search finishes the cursor will be
// put back on the match // put back on the match

6
src/nvim/fileio.c
View File

@@ -6276,9 +6276,9 @@ do_doautocmd (
// Loop over the events. // Loop over the events.
while (*arg && !ends_excmd(*arg) && !ascii_iswhite(*arg)) { while (*arg && !ends_excmd(*arg) && !ascii_iswhite(*arg)) {
if (apply_autocmds_group(event_name2nr(arg, &arg), fname, NULL, TRUE, if (apply_autocmds_group(event_name2nr(arg, &arg), fname, NULL, true,
group, curbuf, NULL)) { group, curbuf, NULL)) {
nothing_done = FALSE; nothing_done = false;
} }
} }
@@ -6757,7 +6757,7 @@ static bool apply_autocmds_group(event_T event, char_u *fname, char_u *fname_io,
if (autocmd_fname != NULL) { if (autocmd_fname != NULL) {
autocmd_fname = vim_strsave(autocmd_fname); autocmd_fname = vim_strsave(autocmd_fname);
} }
autocmd_fname_full = FALSE; /* call FullName_save() later */ autocmd_fname_full = false; // call FullName_save() later
/* /*
* Set the buffer number to be used for <abuf>. * Set the buffer number to be used for <abuf>.

14
src/nvim/normal.c
View File

@@ -1637,11 +1637,11 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
/* Prepare for redoing. Only use the nchar field for "r", /* Prepare for redoing. Only use the nchar field for "r",
* otherwise it might be the second char of the operator. */ * otherwise it might be the second char of the operator. */
if (cap->cmdchar == 'g' && (cap->nchar == 'n' if (cap->cmdchar == 'g' && (cap->nchar == 'n'
|| cap->nchar == 'N')) || cap->nchar == 'N')) {
prep_redo(oap->regname, cap->count0, prep_redo(oap->regname, cap->count0,
get_op_char(oap->op_type), get_extra_op_char(oap->op_type), get_op_char(oap->op_type), get_extra_op_char(oap->op_type),
oap->motion_force, cap->cmdchar, cap->nchar); oap->motion_force, cap->cmdchar, cap->nchar);
else if (cap->cmdchar != ':') { } else if (cap->cmdchar != ':') {
int nchar = oap->op_type == OP_REPLACE ? cap->nchar : NUL; int nchar = oap->op_type == OP_REPLACE ? cap->nchar : NUL;
// reverse what nv_replace() did // reverse what nv_replace() did
@@ -1650,10 +1650,8 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
} else if (nchar == REPLACE_NL_NCHAR) { } else if (nchar == REPLACE_NL_NCHAR) {
nchar = NL; nchar = NL;
} }
prep_redo(oap->regname, 0L, NUL, 'v', prep_redo(oap->regname, 0L, NUL, 'v', get_op_char(oap->op_type),
get_op_char(oap->op_type), get_extra_op_char(oap->op_type), nchar);
get_extra_op_char(oap->op_type),
nchar);
} }
if (!redo_VIsual_busy) { if (!redo_VIsual_busy) {
redo_VIsual_mode = resel_VIsual_mode; redo_VIsual_mode = resel_VIsual_mode;

2
src/nvim/option.c
View File

@@ -1525,7 +1525,7 @@ do_set (
origval = oldval; origval = oldval;
} }
if (nextchar == '&') { /* set to default val */ if (nextchar == '&') { // set to default val
newval = options[opt_idx].def_val[ newval = options[opt_idx].def_val[
((flags & P_VI_DEF) || cp_val) ((flags & P_VI_DEF) || cp_val)
? VI_DEFAULT : VIM_DEFAULT]; ? VI_DEFAULT : VIM_DEFAULT];

2
src/nvim/search.c
View File

@@ -3727,7 +3727,7 @@ current_quote (
curwin->w_cursor = VIsual; curwin->w_cursor = VIsual;
VIsual = t; VIsual = t;
vis_bef_curs = TRUE; vis_bef_curs = true;
} }
dec_cursor(); dec_cursor();
} }