vim-patch:8.1.0344: 'hlsearch' highlighting has a gap after /$

Problem:    'hlsearch' highlighting has a gap after /$.
Solution:   Remove suspicious code. (Ricky Zhou, closes vim/vim#3400)

7ee3f15b21
This commit is contained in:
Ricky Zhou 2018-08-26 21:23:59 -07:00
parent f62d4865d8
commit 6c3b0fb831
2 changed files with 13 additions and 9 deletions

View File

@ -3916,14 +3916,6 @@ win_line (
* At end of the text line.
*/
if (c == NUL) {
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;

View File

@ -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)
@ -32,3 +31,16 @@ function! Test_hlsearch()
call getchar(1)
enew!
endfunction
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