diff options
| author | dundargoc <gocdundar@gmail.com> | 2023-09-29 14:58:48 +0200 |
|---|---|---|
| committer | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2023-11-05 20:19:06 +0100 |
| commit | acc646ad8fc3ef11fcc63b69f3d8484e4a91accd (patch) | |
| tree | 613753f19fe6f6fa45884750eb176c1517269ec2 /src/nvim/drawline.c | |
| parent | c513cbf361000e6f09cd5b71b718e9de3f88904d (diff) | |
| download | rneovim-acc646ad8fc3ef11fcc63b69f3d8484e4a91accd.tar.gz rneovim-acc646ad8fc3ef11fcc63b69f3d8484e4a91accd.tar.bz2 rneovim-acc646ad8fc3ef11fcc63b69f3d8484e4a91accd.zip | |
refactor: the long goodbye
long is 32 bits on windows, while it is 64 bits on other architectures.
This makes the type suboptimal for a codebase meant to be
cross-platform. Replace it with more appropriate integer types.
Diffstat (limited to 'src/nvim/drawline.c')
| -rw-r--r-- | src/nvim/drawline.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c index 3d63d2c24c..a28b6a8aa1 100644 --- a/src/nvim/drawline.c +++ b/src/nvim/drawline.c @@ -2832,12 +2832,11 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool number_onl } if (((wp->w_p_cuc - && (int)wp->w_virtcol >= VCOL_HLC - eol_hl_off - && (int)wp->w_virtcol < - (long)grid->cols * (wlv.row - startrow + 1) + v + && wp->w_virtcol >= VCOL_HLC - eol_hl_off + && wp->w_virtcol < grid->cols * (ptrdiff_t)(wlv.row - startrow + 1) + v && lnum != wp->w_cursor.lnum) || draw_color_col || wlv.line_attr_lowprio || wlv.line_attr - || wlv.diff_hlf != (hlf_T)0 || has_virttext)) { + || wlv.diff_hlf != 0 || has_virttext)) { int rightmost_vcol = 0; if (wp->w_p_cuc) { @@ -2881,7 +2880,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool number_onl int col_attr = base_attr; - if (wp->w_p_cuc && VCOL_HLC == (long)wp->w_virtcol) { + if (wp->w_p_cuc && VCOL_HLC == wp->w_virtcol) { col_attr = cuc_attr; } else if (draw_color_col && VCOL_HLC == *color_cols) { col_attr = hl_combine_attr(wlv.line_attr_lowprio, mc_attr); @@ -2978,7 +2977,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool number_onl && search_attr == 0 && area_attr == 0 && wlv.filler_todo <= 0) { - if (wp->w_p_cuc && VCOL_HLC == (long)wp->w_virtcol + if (wp->w_p_cuc && VCOL_HLC == wp->w_virtcol && lnum != wp->w_cursor.lnum) { vcol_save_attr = wlv.char_attr; wlv.char_attr = hl_combine_attr(win_hl_attr(wp, HLF_CUC), wlv.char_attr); |