aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/charset.c2
-rw-r--r--src/nvim/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/nvim/charset.c b/src/nvim/charset.c
index f3bb3d8c73..3e37cbdafd 100644
--- a/src/nvim/charset.c
+++ b/src/nvim/charset.c
@@ -1058,6 +1058,8 @@ int win_lbr_chartabsize(win_T *wp, char_u *line, char_u *s, colnr_T col, int *he
if (col >= (colnr_T)wp->w_width) {
col -= wp->w_width;
numberextra = wp->w_width - (numberextra - win_col_off2(wp));
+ if (*p_sbr != NUL && col >= (colnr_T)STRLEN(p_sbr))
+ col -= (colnr_T)STRLEN(p_sbr);
if (numberextra > 0) {
col = col % numberextra;
}
diff --git a/src/nvim/version.c b/src/nvim/version.c
index d2895a14fa..28404c902c 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -193,7 +193,7 @@ static int included_patches[] = {
//476,
//475,
//474,
- //473,
+ 473,
472,
//471,
//470,