diff options
| -rw-r--r-- | src/nvim/ex_getln.c | 3 | ||||
| -rw-r--r-- | src/nvim/fileio.c | 6 | ||||
| -rw-r--r-- | src/nvim/normal.c | 14 | ||||
| -rw-r--r-- | src/nvim/option.c | 2 | ||||
| -rw-r--r-- | src/nvim/search.c | 2 |
5 files changed, 12 insertions, 15 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 6b13a57980..07aab3307a 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -1056,8 +1056,7 @@ static void command_line_next_incsearch(CommandLineState *s, bool next_match) // put back on the match s->search_start = t; (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 // when nv_search finishes the cursor will be // put back on the match diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 54b0032c9c..91b0a695f1 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -6276,9 +6276,9 @@ do_doautocmd ( // Loop over the events. 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)) { - 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) { 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>. diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 0feac03e32..8f585aef73 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -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", * otherwise it might be the second char of the operator. */ if (cap->cmdchar == 'g' && (cap->nchar == 'n' - || cap->nchar == 'N')) + || cap->nchar == 'N')) { prep_redo(oap->regname, cap->count0, - get_op_char(oap->op_type), get_extra_op_char(oap->op_type), - oap->motion_force, cap->cmdchar, cap->nchar); - else if (cap->cmdchar != ':') { + get_op_char(oap->op_type), get_extra_op_char(oap->op_type), + oap->motion_force, cap->cmdchar, cap->nchar); + } else if (cap->cmdchar != ':') { int nchar = oap->op_type == OP_REPLACE ? cap->nchar : NUL; // 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) { nchar = NL; } - prep_redo(oap->regname, 0L, NUL, 'v', - get_op_char(oap->op_type), - get_extra_op_char(oap->op_type), - nchar); + prep_redo(oap->regname, 0L, NUL, 'v', get_op_char(oap->op_type), + get_extra_op_char(oap->op_type), nchar); } if (!redo_VIsual_busy) { redo_VIsual_mode = resel_VIsual_mode; diff --git a/src/nvim/option.c b/src/nvim/option.c index b0e0d01504..c805e41ec5 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -1525,7 +1525,7 @@ do_set ( origval = oldval; } - if (nextchar == '&') { /* set to default val */ + if (nextchar == '&') { // set to default val newval = options[opt_idx].def_val[ ((flags & P_VI_DEF) || cp_val) ? VI_DEFAULT : VIM_DEFAULT]; diff --git a/src/nvim/search.c b/src/nvim/search.c index ffc81ab826..5d41ed9c2a 100644 --- a/src/nvim/search.c +++ b/src/nvim/search.c @@ -3727,7 +3727,7 @@ current_quote ( curwin->w_cursor = VIsual; VIsual = t; - vis_bef_curs = TRUE; + vis_bef_curs = true; } dec_cursor(); } |