From 20ccdc7e50e8ba1d84d6eb0092babc35a5ae61ea Mon Sep 17 00:00:00 2001 From: Drew Vogel Date: Mon, 10 Nov 2025 19:58:31 +0000 Subject: [PATCH] patch 9.1.1902: GTK fails to compile with !FEAT_PROP_POPUP Problem: GTK fails to compile with !FEAT_PROP_POPUP Solution: Correct syntax under #ifdef (Drew Vogel) related: #18708 Signed-off-by: Drew Vogel Signed-off-by: Christian Brabandt --- src/drawline.c | 8 +++++--- src/version.c | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/drawline.c b/src/drawline.c index 7db64d0ee5..5ad45c6c3c 100644 --- a/src/drawline.c +++ b/src/drawline.c @@ -3107,11 +3107,13 @@ win_line( char_u *p = ptr - (mb_off + 1); chartabsize_T cts; - init_chartabsize_arg(&cts, wp, lnum, wlv.vcol + + colnr_T init_colnr = wlv.vcol; # ifdef FEAT_PROP_POPUP - - vcol_first_char, + init_colnr -= vcol_first_char; # endif - line, p); + init_chartabsize_arg(&cts, wp, lnum, init_colnr, line, p); + # ifdef FEAT_PROP_POPUP // do not want virtual text counted here cts.cts_has_prop_with_text = FALSE; diff --git a/src/version.c b/src/version.c index df2c7f0508..743af8af9a 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1902, /**/ 1901, /**/