summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/drawline.c4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/drawline.c b/src/drawline.c
index f02e4f3a2f..3d8b02ebef 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -977,9 +977,11 @@ win_line(
int n_skip = 0; // nr of cells to skip for 'nowrap' or
// concealing
+#ifdef FEAT_PROP_POPUP
int skip_cells = 0; // nr of cells to skip for virtual text
// after the line, when w_skipcol is
// larger than the text length
+#endif
int fromcol_prev = -2; // start of inverting after cursor
int noinvcur = FALSE; // don't invert the cursor
@@ -1508,10 +1510,12 @@ win_line(
n_skip = v - wlv.vcol;
}
+#ifdef FEAT_PROP_POPUP
// If there the text doesn't reach to the desired column, need to skip
// "skip_cells" cells when virtual text follows.
if (!wp->w_p_wrap && v > wlv.vcol)
skip_cells = v - wlv.vcol;
+#endif
// Adjust for when the inverted text is before the screen,
// and when the start of the inverted text is before the screen.
diff --git a/src/version.c b/src/version.c
index bfdd1faec8..f33673e15f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 717,
+/**/
716,
/**/
715,