summaryrefslogtreecommitdiff
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 72838d0f9..e47fd89c6 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -771,7 +771,9 @@ win_linetabsize(win_T *wp, linenr_T lnum, char_u *line, colnr_T len)
chartabsize_T cts;
init_chartabsize_arg(&cts, wp, lnum, 0, line, line);
+#ifdef FEAT_PROP_POPUP
cts.cts_with_trailing = len == MAXCOL;
+#endif
for ( ; *cts.cts_ptr != NUL && (len == MAXCOL || cts.cts_ptr < line + len);
MB_PTR_ADV(cts.cts_ptr))
cts.cts_vcol += win_lbr_chartabsize(&cts, NULL);
diff --git a/src/version.c b/src/version.c
index aed14f067..118a38ba3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 123,
+/**/
122,
/**/
121,