Mercurial > vim

comparison src/drawline.c @ 22818:b27601c0d289 v8.2.1957

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1957: diff and cursorcolumn highlighting don't mix Commit: https://github.com/vim/vim/commit/fabc3ca896751277f18a3a68e5661179728db3ad Author: Bram Moolenaar <Bram@vim.org> Date: Thu Nov 5 19:07:21 2020 +0100 patch 8.2.1957: diff and cursorcolumn highlighting don't mix Problem: Diff and cursorcolumn highlighting don't mix. Solution: Fix condition for what attribute to use. (Christian Brabandt, closes #7258, closes #7260)
author Bram Moolenaar <Bram@vim.org>
date Thu, 05 Nov 2020 19:15:03 +0100
parents 47ebfc274e3f
children 38324d4f1c94
comparison
equal deleted inserted replaced
22817:a5f9d3b1b09b 22818:b27601c0d289
1871 can_spell)) 1871 can_spell))
1872 { 1872 {
1873 char_u *prev_ptr, *p; 1873 char_u *prev_ptr, *p;
1874 int len; 1874 int len;
1875 hlf_T spell_hlf = HLF_COUNT; 1875 hlf_T spell_hlf = HLF_COUNT;
1876
1876 if (has_mbyte) 1877 if (has_mbyte)
1877 { 1878 {
1878 prev_ptr = ptr - mb_l; 1879 prev_ptr = ptr - mb_l;
1879 v -= mb_l - 1; 1880 v -= mb_l - 1;
1880 } 1881 }
2776 // Also highlight the 'colorcolumn' if it is different than 2777 // Also highlight the 'colorcolumn' if it is different than
2777 // 'cursorcolumn' 2778 // 'cursorcolumn'
2778 // Also highlight the 'colorcolumn' if 'breakindent' and/or 'showbreak' 2779 // Also highlight the 'colorcolumn' if 'breakindent' and/or 'showbreak'
2779 // options are set 2780 // options are set
2780 vcol_save_attr = -1; 2781 vcol_save_attr = -1;
2781 if ((draw_state == WL_LINE || 2782 if (((draw_state == WL_LINE ||
2782 draw_state == WL_BRI || 2783 draw_state == WL_BRI ||
2783 draw_state == WL_SBR) && !lnum_in_visual_area 2784 draw_state == WL_SBR) && !lnum_in_visual_area
2784 && search_attr == 0 && area_attr == 0) 2785 && search_attr == 0 && area_attr == 0)
2786 # ifdef FEAT_DIFF
2787 && filler_todo <= 0
2788 # endif
2789 )
2785 { 2790 {
2786 if (wp->w_p_cuc && VCOL_HLC == (long)wp->w_virtcol 2791 if (wp->w_p_cuc && VCOL_HLC == (long)wp->w_virtcol
2787 && lnum != wp->w_cursor.lnum) 2792 && lnum != wp->w_cursor.lnum)
2788 { 2793 {
2789 vcol_save_attr = char_attr; 2794 vcol_save_attr = char_attr;