vim-patch:8.0.0675: 'colorcolumn' has a higher priority than 'hlsearch' (#8483)

Problem:    'colorcolumn' has a higher priority than 'hlsearch', it should be
            the other way around. (Nazri Ramliy)
Solution:   Change the priorities. (LemonBoy, closes vim/vim#1794)
774e5a9673
This commit is contained in:
Jan Edmund Lazo
2018-06-05 11:10:07 -04:00
committed by Justin M. Keyes
parent d9d91bbfef
commit 078202d6f8
2 changed files with 17 additions and 1 deletions

View File

@@ -4061,7 +4061,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) {
vcol_save_attr = char_attr;