summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/charset.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/charset.c b/src/charset.c
index fcc41ec334..006caa2a50 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1184,6 +1184,8 @@ win_lbr_chartabsize(wp, line, s, col, headp)
{
col -= W_WIDTH(wp);
numberextra = W_WIDTH(wp) - (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/version.c b/src/version.c
index f22d195a1b..d7c4cc0999 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 473,
+/**/
472,
/**/
471,