IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor(win_line): rename attr to vi_attr (#21487)

Browse Source 
Vim renamed it in patch 8.1.1391.
This commit is contained in:
zeertzjq 2022-12-21 15:58:59 +08:00 committed by GitHub
parent a6747545be
commit c24605a5a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/drawline.c
View File

@ -553,7 +553,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool nochange,
int char_attr = 0; // attributes for next character int char_attr = 0; // attributes for next character
bool attr_pri = false; // char_attr has priority bool attr_pri = false; // char_attr has priority
bool area_highlighting = false; // Visual or incsearch highlighting in this line bool area_highlighting = false; // Visual or incsearch highlighting in this line
int attr = 0; // attributes for area highlighting int vi_attr = 0; // attributes for Visual and incsearch highlighting
int area_attr = 0; // attributes desired by highlighting int area_attr = 0; // attributes desired by highlighting
int search_attr = 0; // attributes desired by 'hlsearch' int search_attr = 0; // attributes desired by 'hlsearch'
int vcol_save_attr = 0; // saved attr for 'cursorcolumn' int vcol_save_attr = 0; // saved attr for 'cursorcolumn'
@ -792,7 +792,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool nochange,
// if inverting in this line set area_highlighting // if inverting in this line set area_highlighting
if (fromcol >= 0) { if (fromcol >= 0) {
area_highlighting = true; area_highlighting = true;
attr = win_hl_attr(wp, HLF_V); vi_attr = win_hl_attr(wp, HLF_V);
} }
// handle 'incsearch' and ":s///c" highlighting // handle 'incsearch' and ":s///c" highlighting
} else if (highlight_match } else if (highlight_match
@ -816,7 +816,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool nochange,
tocol = fromcol + 1; tocol = fromcol + 1;
} }
area_highlighting = true; area_highlighting = true;
attr = win_hl_attr(wp, HLF_I); vi_attr = win_hl_attr(wp, HLF_I);
} }
} }
@ -1413,7 +1413,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool nochange,
|| ((int)vcol_prev == fromcol_prev || ((int)vcol_prev == fromcol_prev
&& vcol_prev < vcol // not at margin && vcol_prev < vcol // not at margin
&& vcol < tocol)) { && vcol < tocol)) {
area_attr = attr; // start highlighting area_attr = vi_attr; // start highlighting
if (area_highlighting) { if (area_highlighting) {
area_active = true; area_active = true;
} }