diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-01-03 00:44:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-03 00:44:36 +0100 |
| commit | 0afb5fa70aa6b5bc1b007aca5309a5bafd63d868 (patch) | |
| tree | 4c28823971a9411f1fccac4eacd7743bb745f51d /src/nvim/screen.c | |
| parent | 9f19e8d29dcece387d0aec1dc8c96995276ba61f (diff) | |
| parent | 7ede14d191b1220ac872a24433825997d62ff7ec (diff) | |
| download | rneovim-0afb5fa70aa6b5bc1b007aca5309a5bafd63d868.tar.gz rneovim-0afb5fa70aa6b5bc1b007aca5309a5bafd63d868.tar.bz2 rneovim-0afb5fa70aa6b5bc1b007aca5309a5bafd63d868.zip | |
Merge #9425 'build: enable -Wshadow'
Diffstat (limited to 'src/nvim/screen.c')
| -rw-r--r-- | src/nvim/screen.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index c05ee5117a..1e07bbb5e3 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -4006,23 +4006,23 @@ win_line ( draw_color_col = advance_color_col(VCOL_HLC, &color_cols); } - int attr = base_attr; + int col_attr = base_attr; if (wp->w_p_cuc && VCOL_HLC == (long)wp->w_virtcol) { - attr = cuc_attr; + col_attr = cuc_attr; } else if (draw_color_col && VCOL_HLC == *color_cols) { - attr = mc_attr; + col_attr = mc_attr; } if (do_virttext) { - attr = hl_combine_attr(attr, virt_attr); + col_attr = hl_combine_attr(col_attr, virt_attr); } - attr = hl_combine_attr(attr, line_attr); + col_attr = hl_combine_attr(col_attr, line_attr); - linebuf_attr[off] = attr; + linebuf_attr[off] = col_attr; if (cells == 2) { - linebuf_attr[off+1] = attr; + linebuf_attr[off+1] = col_attr; } off += cells * col_stride; @@ -5200,9 +5200,9 @@ win_redr_custom ( curattr = attr; p = buf; for (n = 0; hltab[n].start != NULL; n++) { - int len = (int)(hltab[n].start - p); - grid_puts_len(&default_grid, p, len, row, col, curattr); - col += vim_strnsize(p, len); + int textlen = (int)(hltab[n].start - p); + grid_puts_len(&default_grid, p, textlen, row, col, curattr); + col += vim_strnsize(p, textlen); p = hltab[n].start; if (hltab[n].userhl == 0) |