patch 9.0.0123: cannot build with small features

Problem:    Cannot build with small features.
Solution:   Add #ifdef.

diff --git a/src/charset.c b/src/charset.c
index 72838d0f95b83420f020287fbb21a5399668ce95..e47fd89c604f228a83f285674a9c400f3e6c9ac7 100644 (file)
--- 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 aed14f067a6f86e6a0f8a7f31cf435ea1c5c0fb1..118a38ba3f9e5c8bc397dd7dc679cb2b5e3c0e95 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    123,
 /**/
     122,
 /**/