Mercurial > vim
changeset 14662:04c168a6d998 v8.1.0344
patch 8.1.0344: 'hlsearch' highlighting has a gap after /$
commit https://github.com/vim/vim/commit/7ee3f15b21042cb8148980ea486137eaf1b55bcd
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Sep 2 15:07:28 2018 +0200
patch 8.1.0344: 'hlsearch' highlighting has a gap after /$
Problem: 'hlsearch' highlighting has a gap after /$.
Solution: Remove suspicious code. (Ricky Zhou, closes https://github.com/vim/vim/issues/3400)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 02 Sep 2018 15:15:07 +0200 |
| parents | 2bfea5a64f00 |
| children | 0612ac666447 |
| files | src/screen.c src/testdir/test_hlsearch.vim src/version.c |
| diffstat | 3 files changed, 15 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/screen.c +++ b/src/screen.c @@ -5496,15 +5496,6 @@ win_line( if (c == NUL) { #ifdef FEAT_SYN_HL - if (eol_hl_off > 0 && vcol - eol_hl_off == (long)wp->w_virtcol - && lnum == wp->w_cursor.lnum) - { - /* highlight last char after line */ - --col; - --off; - --vcol; - } - /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ if (wp->w_p_wrap) v = wp->w_skipcol;
--- a/src/testdir/test_hlsearch.vim +++ b/src/testdir/test_hlsearch.vim @@ -4,7 +4,6 @@ function! Test_hlsearch() new call setline(1, repeat(['aaa'], 10)) set hlsearch nolazyredraw - let r=[] " redraw is needed to make hlsearch highlight the matches exe "normal! /aaa\<CR>" | redraw let r1 = screenattr(1, 1) @@ -51,3 +50,16 @@ func Test_hlsearch_hangs() set nohlsearch redrawtime& bwipe! endfunc + +func Test_hlsearch_eol_highlight() + new + call append(1, repeat([''], 9)) + set hlsearch nolazyredraw + exe "normal! /$\<CR>" | redraw + let attr = screenattr(1, 1) + for row in range(2, 10) + call assert_equal(attr, screenattr(row, 1), 'in line ' . row) + endfor + set nohlsearch + bwipe! +endfunc