diff options
| author | Eliseo Martínez <eliseomarmol@gmail.com> | 2015-04-28 10:31:42 +0200 |
|---|---|---|
| committer | Eliseo Martínez <eliseomarmol@gmail.com> | 2015-04-28 10:31:42 +0200 |
| commit | 3450762f0a1e91166aaea27ea80312d39d6f83b6 (patch) | |
| tree | 8c4fe902ae018d385f31a045d4e2338f3463c581 /src/nvim/edit.c | |
| parent | d9441444afa3e99c8116ad01b11614886aa53524 (diff) | |
| parent | 7c956dcbe8017dd68bf4221893bf554302b8fd90 (diff) | |
| download | rneovim-3450762f0a1e91166aaea27ea80312d39d6f83b6.tar.gz rneovim-3450762f0a1e91166aaea27ea80312d39d6f83b6.tar.bz2 rneovim-3450762f0a1e91166aaea27ea80312d39d6f83b6.zip | |
Merge #2518: Enable -Wconversion. (3)
Reviewed-by: Justin M. Keyes <justinkz@gmail.com>
Diffstat (limited to 'src/nvim/edit.c')
| -rw-r--r-- | src/nvim/edit.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index d19f10f47f..413df3c036 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -192,7 +192,7 @@ static int compl_opt_refresh_always = FALSE; #define BACKSPACE_WORD_NOT_SPACE 3 #define BACKSPACE_LINE 4 -static int spell_bad_len = 0; /* length of located bad word */ +static size_t spell_bad_len = 0; /* length of located bad word */ static colnr_T Insstart_textlen; /* length of line when insert started */ static colnr_T Insstart_blank_vcol; /* vcol for first inserted blank */ @@ -3539,11 +3539,12 @@ static int ins_compl_get_exp(pos_T *ini) case CTRL_X_PATH_PATTERNS: case CTRL_X_PATH_DEFINES: find_pattern_in_path(compl_pattern, compl_direction, - (int)STRLEN(compl_pattern), FALSE, FALSE, - (type == CTRL_X_PATH_DEFINES - && !(compl_cont_status & CONT_SOL)) - ? FIND_DEFINE : FIND_ANY, 1L, ACTION_EXPAND, - (linenr_T)1, (linenr_T)MAXLNUM); + STRLEN(compl_pattern), FALSE, FALSE, + ((type == CTRL_X_PATH_DEFINES + && !(compl_cont_status & CONT_SOL)) + ? FIND_DEFINE + : FIND_ANY), + 1L, ACTION_EXPAND, 1, MAXLNUM); break; case CTRL_X_DICTIONARY: @@ -4401,8 +4402,10 @@ static int ins_complete(int c) compl_length = curs_col - compl_col; compl_pattern = vim_strnsave(line + compl_col, compl_length); } else if (ctrl_x_mode == CTRL_X_SPELL) { - if (spell_bad_len > 0) - compl_col = curs_col - spell_bad_len; + if (spell_bad_len > 0) { + assert(spell_bad_len <= INT_MAX); + compl_col = curs_col - (int)spell_bad_len; + } else compl_col = spell_word_start(startcol); if (compl_col >= (colnr_T)startcol) { @@ -5590,7 +5593,6 @@ static void check_spell_redraw(void) static void spell_back_to_badword(void) { pos_T tpos = curwin->w_cursor; - spell_bad_len = spell_move_to(curwin, BACKWARD, TRUE, TRUE, NULL); if (curwin->w_cursor.col != tpos.col) start_arrow(&tpos); |