mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-07 15:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #3745 from cacplate/ops_Wconversion

Browse Source 
Enable -Wconversion in ops.c
This commit is contained in:
Justin M. Keyes
2016-06-13 04:33:30 -04:00
committed by GitHub
parent 0ea01c1586 c4da27095c
commit 28cc5a0646
13 changed files with 324 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/normal.c
View File

@@ -1795,10 +1795,11 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
if (oap->line_count < 2)
oap->line_count = 2;
if (curwin->w_cursor.lnum + oap->line_count - 1 >
curbuf->b_ml.ml_line_count)
curbuf->b_ml.ml_line_count) {
beep_flush();
else {
do_join(oap->line_count, oap->op_type == OP_JOIN, true, true, true);
} else {
do_join((size_t)oap->line_count, oap->op_type == OP_JOIN,
true, true, true);
auto_format(false, true);
}
break;
@@ -7666,7 +7667,7 @@ static void nv_join(cmdarg_T *cap)
prep_redo(cap->oap->regname, cap->count0,
NUL, cap->cmdchar, NUL, NUL, cap->nchar);
do_join(cap->count0, cap->nchar == NUL, true, true, true);
do_join((size_t)cap->count0, cap->nchar == NUL, true, true, true);
}
}