aboutsummaryrefslogtreecommitdiff
path: root/src/nvim
diff options
context:
space:
mode:
Diffstat (limited to 'src/nvim')
-rw-r--r--src/nvim/drawline.c3
-rw-r--r--src/nvim/plines.c7
2 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c
index 012cce7b22..ed22f71239 100644
--- a/src/nvim/drawline.c
+++ b/src/nvim/drawline.c
@@ -1796,8 +1796,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool nochange,
if (has_decor && v >= 0) {
bool selected = (area_active || (area_highlighting && noinvcur
&& wlv.vcol == wp->w_virtcol));
- extmark_attr = decor_redraw_col(wp, (colnr_T)v, wlv.off,
- selected, &decor_state);
+ extmark_attr = decor_redraw_col(wp, (colnr_T)v, wlv.off, selected, &decor_state);
// we could already be inside an existing virt_line with multiple chunks
if (!(virt_inline_i < kv_size(virt_inline))) {
diff --git a/src/nvim/plines.c b/src/nvim/plines.c
index 738057b696..dd4955c352 100644
--- a/src/nvim/plines.c
+++ b/src/nvim/plines.c
@@ -396,12 +396,13 @@ int win_lbr_chartabsize(chartabsize_T *cts, int *headp)
mtkey_t mark = marktree_itr_current(cts->cts_iter);
if (mark.pos.row != cts->cts_row || mark.pos.col > col) {
break;
- } else if (mark.pos.col == col) { // TODO: or maybe unconditionally, what if byte-misaligned?
+ } else if (mark.pos.col
+ == col) { // TODO(bfredl): or maybe unconditionally, what if byte-misaligned?
if (!mt_end(mark)) {
Decoration decor = get_decor(mark);
if (decor.virt_text_pos == kVTInline) {
- cts->cts_cur_text_width = decor.virt_text_width;
- size += cts->cts_cur_text_width;
+ cts->cts_cur_text_width += decor.virt_text_width;
+ size += decor.virt_text_width;
}
}
}