patch 8.0.0675: 'colorcolumn' has a higher priority than 'hlsearch'

Problem:    'colorcolumn' has a higher priority than 'hlsearch', it should be
            the other way around. (Nazri Ramliy)
Solution:   Change the priorities. (LemonBoy, closes #1794)

diff --git a/src/screen.c b/src/screen.c
index 617051c95ec73f610b6768161d44a9fb21914e56..3b281a89423e5058867bfa185e7235959036cbdf 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -5502,7 +5502,8 @@ win_line(
         * Also highlight the 'colorcolumn' if it is different than
         * 'cursorcolumn' */
        vcol_save_attr = -1;
-       if (draw_state == WL_LINE && !lnum_in_visual_area)
+       if (draw_state == WL_LINE && !lnum_in_visual_area
+               && search_attr == 0 && area_attr == 0)
        {
            if (wp->w_p_cuc && VCOL_HLC == (long)wp->w_virtcol
                                                 && lnum != wp->w_cursor.lnum)

diff --git a/src/testdir/test_listlbr_utf8.vim b/src/testdir/test_listlbr_utf8.vim
index 56a4cc9b311cbb0b43683839f01eac64d9105949..b648a3361b90d98f00a7d7729f05bac6123a55e2 100644 (file)
--- a/src/testdir/test_listlbr_utf8.vim
+++ b/src/testdir/test_listlbr_utf8.vim
@@ -194,6 +194,21 @@ func Test_multibyte_sign_and_colorcolumn()
   call s:close_windows()
 endfunc
 
+func Test_colorcolumn_priority()
+  call s:test_windows('setl cc=4 cuc hls')
+  call setline(1, ["xxyy", ""])
+  norm! gg
+  exe "normal! /xxyy\<CR>"
+  norm! G
+  redraw!
+  let line_attr = s:screen_attr(1, [1, &cc])
+  " Search wins over CursorColumn
+  call assert_equal(line_attr[1], line_attr[0])
+  " Search wins over Colorcolumn
+  call assert_equal(line_attr[2], line_attr[3])
+  call s:close_windows('setl hls&vim')
+endfunc
+
 func Test_illegal_byte_and_breakat()
   call s:test_windows("setl sbr= brk+=<")
   vert resize 18

diff --git a/src/version.c b/src/version.c
index fa4f6fb04660bdcd3f305d0773cd789e1372cd3a..8dbd2a7d353a0f8efd3a605bb4165720da68d3ec 100644 (file)
--- 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 */
+/**/
+    675,
 /**/
     674,
 /**/