patch 8.2.2003: build error with +conceal but without +popupwin

Problem:    Build error with +conceal but without +popupwin.
Solution:   Add #ifdef. (Tom Ryder, closes #7316)

diff --git a/src/drawline.c b/src/drawline.c
index fcca38a2e92f5dbc7d2b84fdb160e00c34a2abd9..0b9974216393e4600e06c4af4f975166a6b1428e 100644 (file)
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -2446,16 +2446,18 @@ win_line(
                && conceal_cursor_line(wp)
                && (int)wp->w_virtcol <= vcol + n_skip)
        {
-#  ifdef FEAT_RIGHTLEFT
+# ifdef FEAT_RIGHTLEFT
            if (wp->w_p_rl)
                wp->w_wcol = wp->w_width - col + boguscols - 1;
            else
-#  endif
+# endif
                wp->w_wcol = col - boguscols;
            wp->w_wrow = row;
            did_wcol = TRUE;
            curwin->w_valid |= VALID_WCOL|VALID_WROW|VALID_VIRTCOL;
+# ifdef FEAT_PROP_POPUP
            curwin->w_flags &= ~(WFLAG_WCOL_OFF_ADDED | WFLAG_WROW_OFF_ADDED);
+# endif
        }
 #endif
 

diff --git a/src/version.c b/src/version.c
index 7f4996761ff3a056a9d7144f3ca1e6158cc6a609..a34e9bfa819622974bc20ef325f89176a89c1cd3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2003,
 /**/
     2002,
 /**/