diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-06-13 04:33:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-13 04:33:30 -0400 |
| commit | 28cc5a06462090a0411201b2c44140c37a433a0f (patch) | |
| tree | 3d198c60f3f2021a5db89faa61c8ea7fa33e70f7 /src/nvim/normal.c | |
| parent | 0ea01c15861eb6952b5db45f6a6b6ef507954e5b (diff) | |
| parent | c4da27095ccce52f9e2e7e0d80b5c1475c1fd66d (diff) | |
| download | rneovim-28cc5a06462090a0411201b2c44140c37a433a0f.tar.gz rneovim-28cc5a06462090a0411201b2c44140c37a433a0f.tar.bz2 rneovim-28cc5a06462090a0411201b2c44140c37a433a0f.zip | |
Merge #3745 from cacplate/ops_Wconversion
Enable -Wconversion in ops.c
Diffstat (limited to 'src/nvim/normal.c')
| -rw-r--r-- | src/nvim/normal.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index d4055ac1ef..c95e5e1a15 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -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); } } |