mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-22 19:18:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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 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
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/screen.c
View File

@@ -4061,7 +4061,8 @@ win_line (
* Also highlight the 'colorcolumn' if it is different than * Also highlight the 'colorcolumn' if it is different than
* 'cursorcolumn' */ * 'cursorcolumn' */
vcol_save_attr = -1; 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 if (wp->w_p_cuc && VCOL_HLC == (long)wp->w_virtcol
&& lnum != wp->w_cursor.lnum) { && lnum != wp->w_cursor.lnum) {
vcol_save_attr = char_attr; vcol_save_attr = char_attr;

15
src/nvim/testdir/test_listlbr_utf8.vim
View File

@@ -194,6 +194,21 @@ func Test_multibyte_sign_and_colorcolumn()
call s:close_windows() call s:close_windows()
endfunc 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() func Test_illegal_byte_and_breakat()
call s:test_windows("setl sbr= brk+=<") call s:test_windows("setl sbr= brk+=<")
vert resize 18 vert resize 18