diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-27 18:34:29 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-27 18:34:29 +0200 |
| commit | e17bdffff78ebd6a4e3cff26754cc667557ea810 (patch) | |
| tree | 10710296d3d60c51938e5f7e577abe2edccbdb47 | |
| parent | 1195669f9e434fa9ab8b57ee9470bf951e4990b8 (diff) | |
| download | vim-git-e17bdffff78ebd6a4e3cff26754cc667557ea810.tar.gz | |
patch 7.4.2269v7.4.2269
Problem: Using 'hlsearch' highlighting instead of matchpos if there is no
search match.
Solution: Pass NULL as last item to next_search_hl() when searching for
'hlsearch' match. (Shane Harper, closes #1013)
| -rw-r--r-- | src/screen.c | 9 | ||||
| -rw-r--r-- | src/testdir/test_match.vim | 27 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 35 insertions, 3 deletions
diff --git a/src/screen.c b/src/screen.c index b580aee78..ab1e85f6d 100644 --- a/src/screen.c +++ b/src/screen.c @@ -3546,7 +3546,8 @@ win_line( v = (long)(ptr - line); if (cur != NULL) cur->pos.cur = 0; - next_search_hl(wp, shl, lnum, (colnr_T)v, cur); + next_search_hl(wp, shl, lnum, (colnr_T)v, + shl == &search_hl ? NULL : cur); /* Need to get the line again, a multi-line regexp may have made it * invalid. */ @@ -3980,7 +3981,8 @@ win_line( #ifdef FEAT_CONCEAL prev_syntax_id = 0; #endif - next_search_hl(wp, shl, lnum, (colnr_T)v, cur); + next_search_hl(wp, shl, lnum, (colnr_T)v, + shl == &search_hl ? NULL : cur); pos_inprogress = cur == NULL || cur->pos.cur == 0 ? FALSE : TRUE; @@ -7607,7 +7609,8 @@ prepare_search_hl(win_T *wp, linenr_T lnum) while (shl->first_lnum < lnum && (shl->rm.regprog != NULL || (cur != NULL && pos_inprogress))) { - next_search_hl(wp, shl, shl->first_lnum, (colnr_T)n, cur); + next_search_hl(wp, shl, shl->first_lnum, (colnr_T)n, + shl == &search_hl ? NULL : cur); pos_inprogress = cur == NULL || cur->pos.cur == 0 ? FALSE : TRUE; if (shl->lnum != 0) diff --git a/src/testdir/test_match.vim b/src/testdir/test_match.vim index 000893673..9ac1db157 100644 --- a/src/testdir/test_match.vim +++ b/src/testdir/test_match.vim @@ -186,4 +186,31 @@ func Test_matchaddpos() set hlsearch& endfunc +func Test_matchaddpos_using_negative_priority() + set hlsearch + + call clearmatches() + + call setline(1, 'x') + let @/='x' + redraw! + let search_attr = screenattr(1,1) + + let @/='' + call matchaddpos('Error', [1], 10) + redraw! + let error_attr = screenattr(1,1) + + call setline(2, '-1 match priority') + call matchaddpos('Error', [2], -1) + redraw! + let negative_match_priority_attr = screenattr(2,1) + + call assert_notequal(negative_match_priority_attr, search_attr, "Match with negative priority is incorrectly highlighted with Search highlight.") + call assert_equal(negative_match_priority_attr, error_attr) + + nohl + set hlsearch& +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index 529b255cc..289474ba8 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2269, +/**/ 2268, /**/ 2267, |