diff options
Diffstat (limited to 'src/nvim/match.c')
| -rw-r--r-- | src/nvim/match.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/nvim/match.c b/src/nvim/match.c index 0a7c264d4f..c8837969b6 100644 --- a/src/nvim/match.c +++ b/src/nvim/match.c @@ -16,14 +16,15 @@ #include "nvim/ex_cmds_defs.h" #include "nvim/ex_docmd.h" #include "nvim/fold.h" -#include "nvim/func_attr.h" -#include "nvim/gettext.h" +#include "nvim/gettext_defs.h" #include "nvim/globals.h" #include "nvim/highlight.h" +#include "nvim/highlight_defs.h" #include "nvim/highlight_group.h" #include "nvim/macros_defs.h" #include "nvim/match.h" #include "nvim/mbyte.h" +#include "nvim/mbyte_defs.h" #include "nvim/memline.h" #include "nvim/memory.h" #include "nvim/message.h" @@ -451,10 +452,8 @@ static void next_search_hl(win_T *win, match_T *search_hl, match_T *shl, linenr_ } else if (vim_strchr(p_cpo, CPO_SEARCH) == NULL || (shl->rm.endpos[0].lnum == 0 && shl->rm.endpos[0].col <= shl->rm.startpos[0].col)) { - char *ml; - matchcol = shl->rm.startpos[0].col; - ml = ml_get_buf(shl->buf, lnum) + matchcol; + char *ml = ml_get_buf(shl->buf, lnum) + matchcol; if (*ml == NUL) { matchcol++; shl->lnum = 0; @@ -669,7 +668,7 @@ bool prepare_search_hl_line(win_T *wp, linenr_T lnum, colnr_T mincol, char **lin /// is endcol. /// Return the updated search_attr. int update_search_hl(win_T *wp, linenr_T lnum, colnr_T col, char **line, match_T *search_hl, - int *has_match_conc, int *match_conc, int lcs_eol_one, bool *on_last_col, + int *has_match_conc, int *match_conc, bool lcs_eol_todo, bool *on_last_col, bool *search_attr_from_match) { matchitem_T *cur = wp->w_match_head; // points to the match list @@ -790,7 +789,7 @@ int update_search_hl(win_T *wp, linenr_T lnum, colnr_T col, char **line, match_T } } // Only highlight one character after the last column. - if (*(*line + col) == NUL && (wp->w_p_list && lcs_eol_one == -1)) { + if (*(*line + col) == NUL && (wp->w_p_list && !lcs_eol_todo)) { search_attr = 0; } return search_attr; |