From 1efefda623283d941705d8f6ad0e9cfe0ac76079 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 17 Nov 2020 19:22:06 +0100 Subject: [PATCH] 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) --- src/drawline.c | 6 ++++-- src/version.c | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/drawline.c b/src/drawline.c index fcca38a2e..0b9974216 100644 --- 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 7f4996761..a34e9bfa8 100644 --- 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, /**/ -- 2.40.0