# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1605637804 -3600
# Node ID 1b1dc9dad42c636e8f4bf55e22c8ea527e78a202
# Parent  3b89427262e6c49e87430525fe3dc3fe099dfe44
patch 8.2.2003: build error with +conceal but without +popupwin

Commit: https://github.com/vim/vim/commit/1efefda623283d941705d8f6ad0e9cfe0ac76079
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Nov 17 19:22:06 2020 +0100

    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 https://github.com/vim/vim/issues/7316)

diff --git a/src/drawline.c b/src/drawline.c
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2003,
+/**/
     2002,
 /**/
     2001,