diff options
author | bfredl <bjorn.linse@gmail.com> | 2022-11-22 11:02:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-22 11:02:24 +0100 |
commit | cd386b2c72eaacd9acac27380ee34db1accad9cb (patch) | |
tree | 15f906032e4091204450ed197da3ad97ddcb5049 /src/nvim/normal.c | |
parent | 5eb5f4948826e9d47685ea9e257409cc3e693614 (diff) | |
parent | 40f3f75867bf03abfd90e0389a38197a00d37af1 (diff) | |
download | rneovim-cd386b2c72eaacd9acac27380ee34db1accad9cb.tar.gz rneovim-cd386b2c72eaacd9acac27380ee34db1accad9cb.tar.bz2 rneovim-cd386b2c72eaacd9acac27380ee34db1accad9cb.zip |
Merge pull request #20151 from dundargoc/refactor/char_u/13
refactor: replace char_u with char 13: remove `STRLEN` part 3
Diffstat (limited to 'src/nvim/normal.c')
-rw-r--r-- | src/nvim/normal.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 8207710b6b..f9b32a9bd6 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -1835,11 +1835,11 @@ void clear_showcmd(void) int chars = 0; if (cursor_bot) { - s = ml_get_pos(&VIsual); + s = (char_u *)ml_get_pos(&VIsual); e = (char_u *)get_cursor_pos_ptr(); } else { s = (char_u *)get_cursor_pos_ptr(); - e = ml_get_pos(&VIsual); + e = (char_u *)ml_get_pos(&VIsual); } while ((*p_sel != 'e') ? s <= e : s < e) { l = utfc_ptr2len((char *)s); @@ -2743,7 +2743,7 @@ static int nv_zg_zw(cmdarg_T *cap, int nchar) len = spell_move_to(curwin, FORWARD, true, true, NULL); emsg_off--; if (len != 0 && curwin->w_cursor.col <= pos.col) { - ptr = (char *)ml_get_pos(&curwin->w_cursor); + ptr = ml_get_pos(&curwin->w_cursor); } curwin->w_cursor = pos; } @@ -3589,10 +3589,10 @@ bool get_visual_text(cmdarg_T *cap, char **pp, size_t *lenp) *lenp = strlen(*pp); } else { if (lt(curwin->w_cursor, VIsual)) { - *pp = (char *)ml_get_pos(&curwin->w_cursor); + *pp = ml_get_pos(&curwin->w_cursor); *lenp = (size_t)VIsual.col - (size_t)curwin->w_cursor.col + 1; } else { - *pp = (char *)ml_get_pos(&VIsual); + *pp = ml_get_pos(&VIsual); *lenp = (size_t)curwin->w_cursor.col - (size_t)VIsual.col + 1; } if (**pp == NUL) { @@ -4009,7 +4009,7 @@ static int normal_search(cmdarg_T *cap, int dir, char *pat, int opt, int *wrappe curwin->w_set_curswant = true; CLEAR_FIELD(sia); - int i = do_search(cap->oap, dir, dir, (char_u *)pat, cap->count1, + int i = do_search(cap->oap, dir, dir, pat, cap->count1, opt | SEARCH_OPT | SEARCH_ECHO | SEARCH_MSG, &sia); if (wrapped != NULL) { *wrapped = sia.sa_wrapped; |