Mercurial > vim

comparison src/screen.c @ 11585:18373179040e v8.0.0675

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0675: 'colorcolumn' has a higher priority than 'hlsearch' commit https://github.com/vim/vim/commit/774e5a9673260b1b8b88463669213a96637f72e8 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jun 25 18:03:37 2017 +0200 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)
author Christian Brabandt <cb@256bit.org>
date Sun, 25 Jun 2017 18:15:03 +0200
parents 998d2cf59caa
children 24664144de4e
comparison
equal deleted inserted replaced
11584:25b2326c3b3c 11585:18373179040e
5500 /* Highlight the cursor column if 'cursorcolumn' is set. But don't 5500 /* Highlight the cursor column if 'cursorcolumn' is set. But don't
5501 * highlight the cursor position itself. 5501 * highlight the cursor position itself.
5502 * Also highlight the 'colorcolumn' if it is different than 5502 * Also highlight the 'colorcolumn' if it is different than
5503 * 'cursorcolumn' */ 5503 * 'cursorcolumn' */
5504 vcol_save_attr = -1; 5504 vcol_save_attr = -1;
5505 if (draw_state == WL_LINE && !lnum_in_visual_area) 5505 if (draw_state == WL_LINE && !lnum_in_visual_area
5506 && search_attr == 0 && area_attr == 0)
5506 { 5507 {
5507 if (wp->w_p_cuc && VCOL_HLC == (long)wp->w_virtcol 5508 if (wp->w_p_cuc && VCOL_HLC == (long)wp->w_virtcol
5508 && lnum != wp->w_cursor.lnum) 5509 && lnum != wp->w_cursor.lnum)
5509 { 5510 {
5510 vcol_save_attr = char_attr; 5511 vcol_save_attr = char_attr;