diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-06-26 11:01:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-26 11:01:10 +0200 |
| commit | 469726d3c5ae2b1db2366625d07f830e68ed1e05 (patch) | |
| tree | 5d83973b94aa810e23ebbd9353476a74592508d4 /src/nvim/screen.c | |
| parent | 8b263c7a6868105adae69f001899c5837b302bef (diff) | |
| parent | 2d6c91ab9954c2f3be27c7eefaaa498d91e557be (diff) | |
| download | rneovim-469726d3c5ae2b1db2366625d07f830e68ed1e05.tar.gz rneovim-469726d3c5ae2b1db2366625d07f830e68ed1e05.tar.bz2 rneovim-469726d3c5ae2b1db2366625d07f830e68ed1e05.zip | |
Merge #10340 from janlazo/vim-8.1.1593
vim-patch:8.0.1688,8.1.1593
Diffstat (limited to 'src/nvim/screen.c')
| -rw-r--r-- | src/nvim/screen.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index d91b832e5a..d141520fef 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -1709,7 +1709,6 @@ static void fold_line(win_T *wp, long fold_count, foldinfo_T *foldinfo, linenr_T int col; int txtcol; int off; - int ri; /* Build the fold line: * 1. Add the cmdwin_type for the command-line window @@ -1753,15 +1752,18 @@ static void fold_line(win_T *wp, long fold_count, foldinfo_T *foldinfo, linenr_T col += fdc; } -# define RL_MEMSET(p, v, l) if (wp->w_p_rl) { \ - for (ri = 0; ri < l; ri++) { \ - linebuf_attr[off + (wp->w_grid.Columns - (p) - (l)) + ri] = v; \ +# define RL_MEMSET(p, v, l) \ + do { \ + if (wp->w_p_rl) { \ + for (int ri = 0; ri < l; ri++) { \ + linebuf_attr[off + (wp->w_grid.Columns - (p) - (l)) + ri] = v; \ + } \ + } else { \ + for (int ri = 0; ri < l; ri++) { \ + linebuf_attr[off + (p) + ri] = v; \ + } \ } \ - } else { \ - for (ri = 0; ri < l; ri++) { \ - linebuf_attr[off + (p) + ri] = v; \ - } \ - } + } while (0) /* Set all attributes of the 'number' or 'relativenumber' column and the * text */ |