diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-12-21 15:58:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-21 15:58:59 +0800 |
| commit | c24605a5a08873d0c7161941b0c7d0aba63d1ccc (patch) | |
| tree | 4f45804c28ca32da16278bb0511691ffca0ac224 | |
| parent | a6747545be8371e53f16189219ec3950d4b219f7 (diff) | |
| download | rneovim-c24605a5a08873d0c7161941b0c7d0aba63d1ccc.tar.gz rneovim-c24605a5a08873d0c7161941b0c7d0aba63d1ccc.tar.bz2 rneovim-c24605a5a08873d0c7161941b0c7d0aba63d1ccc.zip | |
refactor(win_line): rename attr to vi_attr (#21487)
Vim renamed it in patch 8.1.1391.
| -rw-r--r-- | src/nvim/drawline.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c index b5119ca8a2..74e493926f 100644 --- a/src/nvim/drawline.c +++ b/src/nvim/drawline.c @@ -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 bool attr_pri = false; // char_attr has priority 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 search_attr = 0; // attributes desired by 'hlsearch' 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 (fromcol >= 0) { area_highlighting = true; - attr = win_hl_attr(wp, HLF_V); + vi_attr = win_hl_attr(wp, HLF_V); } // handle 'incsearch' and ":s///c" highlighting } 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; } 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 && vcol_prev < vcol // not at margin && vcol < tocol)) { - area_attr = attr; // start highlighting + area_attr = vi_attr; // start highlighting if (area_highlighting) { area_active = true; } |