thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

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

Browse Source 
Problem:    'colorcolumn' has a higher priority than 'hlsearch', it should be
            the other way around. (Nazri Ramliy)
Solution:   Change the priorities. (LemonBoy, closes #1794)
This commit is contained in:
Bram Moolenaar
2017-06-25 18:03:37 +02:00
parent 5d7be4f0fa
commit 774e5a9673
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/screen.c
View File

@@ -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)