diff --git a/src/charset.c b/src/charset.c
index 72838d0..e47fd89 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -771,7 +771,9 @@
     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 aed14f0..118a38b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    123,
+/**/
     122,
 /**/
     121,