Patch 8.2.2003

[Bram Moolenaar]

Patch 8.2.2003
Problem: Build error with +conceal but without +popupwin.
Solution: Add #ifdef. (Tom Ryder, closes #7316)
Files: src/drawline.c


*** ../vim-8.2.2002/src/drawline.c 2020-11-15 20:32:54.167882094 +0100
--- src/drawline.c 2020-11-17 19:20:06.079272082 +0100
***************
*** 2446,2461 ****
&& conceal_cursor_line(wp)
&& (int)wp->w_virtcol <= vcol + n_skip)
{
! # ifdef FEAT_RIGHTLEFT
if (wp->w_p_rl)
wp->w_wcol = wp->w_width - col + boguscols - 1;
else
! # endif
wp->w_wcol = col - boguscols;
wp->w_wrow = row;
did_wcol = TRUE;
curwin->w_valid |= VALID_WCOL|VALID_WROW|VALID_VIRTCOL;
curwin->w_flags &= ~(WFLAG_WCOL_OFF_ADDED | WFLAG_WROW_OFF_ADDED);
}
#endif

--- 2446,2463 ----
&& conceal_cursor_line(wp)
&& (int)wp->w_virtcol <= vcol + n_skip)
{
! # ifdef FEAT_RIGHTLEFT
if (wp->w_p_rl)
wp->w_wcol = wp->w_width - col + boguscols - 1;
else
! # 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

*** ../vim-8.2.2002/src/version.c 2020-11-17 18:50:40.791592326 +0100
--- src/version.c 2020-11-17 19:21:10.883086606 +0100
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 2003,
/**/

--
XML is a nice language for computers. Not for humans.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///