adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Problem:    Build error with +conceal but without +popupwin.
Solution:   Add #ifdef. (Tom Ryder, closes #7316)
This commit is contained in:
Bram Moolenaar
2020-11-17 19:22:06 +01:00
parent 52bf81c2d5
commit 1efefda623
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/drawline.c
View File

@ -2446,16 +2446,18 @@ win_line(
&& conceal_cursor_line(wp) && conceal_cursor_line(wp)
&& (int)wp->w_virtcol <= vcol + n_skip) && (int)wp->w_virtcol <= vcol + n_skip)
{ {
# ifdef FEAT_RIGHTLEFT # ifdef FEAT_RIGHTLEFT
if (wp->w_p_rl) if (wp->w_p_rl)
wp->w_wcol = wp->w_width - col + boguscols - 1; wp->w_wcol = wp->w_width - col + boguscols - 1;
else else
# endif # endif
wp->w_wcol = col - boguscols; wp->w_wcol = col - boguscols;
wp->w_wrow = row; wp->w_wrow = row;
did_wcol = TRUE; did_wcol = TRUE;
curwin->w_valid |= VALID_WCOL|VALID_WROW|VALID_VIRTCOL; curwin->w_valid |= VALID_WCOL|VALID_WROW|VALID_VIRTCOL;
# ifdef FEAT_PROP_POPUP
curwin->w_flags &= ~(WFLAG_WCOL_OFF_ADDED | WFLAG_WROW_OFF_ADDED); curwin->w_flags &= ~(WFLAG_WCOL_OFF_ADDED | WFLAG_WROW_OFF_ADDED);
# endif
} }
#endif #endif

2
src/version.c
View File

@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2003,
/**/ /**/
2002, 2002,
/**/ /**/