summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-09-02 15:07:28 +0200
committerBram Moolenaar <Bram@vim.org>2018-09-02 15:07:28 +0200
commit7ee3f15b21042cb8148980ea486137eaf1b55bcd (patch)
treea7f6dd33a377f7cd245c45eb519c90d548218243
parent3c5b8cd25485183ff7ce737e4dac069541210f6c (diff)
patch 8.1.0344: 'hlsearch' highlighting has a gap after /$v8.1.0344
Problem: 'hlsearch' highlighting has a gap after /$. Solution: Remove suspicious code. (Ricky Zhou, closes #3400)
-rw-r--r--src/screen.c9
-rw-r--r--src/testdir/test_hlsearch.vim14
-rw-r--r--src/version.c2
3 files changed, 15 insertions, 10 deletions
diff --git a/src/screen.c b/src/screen.c
index 410772ac57..743c321c47 100644
--- 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;
diff --git a/src/testdir/test_hlsearch.vim b/src/testdir/test_hlsearch.vim
index db7a937da3..0b59440594 100644
--- 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
diff --git a/src/version.c b/src/version.c
index 1077b9abee..b1e76e50a0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 344,
+/**/
343,
/**/
342,