diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-08-28 23:43:04 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-08-28 23:43:04 +0200 |
| commit | 461d46d8ace1b6950bf2733de9cb2b290453d86d (patch) | |
| tree | a592acf9f95e8c60cc396f48ac4bf73656c0846c /src/nvim/syntax.c | |
| parent | 885ca3b7a60b79feb1d4c9e54265c8b543d4f245 (diff) | |
| parent | a2403a0ed9afdfaea7abb5555dbdf555b56eff9a (diff) | |
| download | rneovim-461d46d8ace1b6950bf2733de9cb2b290453d86d.tar.gz rneovim-461d46d8ace1b6950bf2733de9cb2b290453d86d.tar.bz2 rneovim-461d46d8ace1b6950bf2733de9cb2b290453d86d.zip | |
Merge #8863 'refactor: Remove mb_head_off()'
Diffstat (limited to 'src/nvim/syntax.c')
| -rw-r--r-- | src/nvim/syntax.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c index 3cb998b805..332c50129e 100644 --- a/src/nvim/syntax.c +++ b/src/nvim/syntax.c @@ -1726,16 +1726,12 @@ static int syn_current_attr( */ if (do_keywords) { line = syn_getcurline(); - if (vim_iswordp_buf(line + current_col, syn_buf) - && (current_col == 0 - || !vim_iswordp_buf(line + current_col - 1 - - (has_mbyte - ? (*mb_head_off)(line, line + current_col - 1) - : 0) - , syn_buf))) { - syn_id = check_keyword_id(line, (int)current_col, - &endcol, &flags, &next_list, cur_si, - &cchar); + const char_u *cur_pos = line + current_col; + if (vim_iswordp_buf(cur_pos, syn_buf) + && (current_col == 0 || !vim_iswordp_buf( + cur_pos - 1 - utf_head_off(line, cur_pos - 1), syn_buf))) { + syn_id = check_keyword_id(line, (int)current_col, &endcol, &flags, + &next_list, cur_si, &cchar); if (syn_id != 0) { push_current_state(KEYWORD_IDX); { |