patch 9.1.1902: GTK fails to compile with !FEAT_PROP_POPUP
Commit:
https://github.com/vim/vim/commit/20ccdc7e50e8ba1d84d6eb0092babc35a5ae61ea
Author: Drew Vogel <dvogel@github>
Date: Mon Nov 10 19:58:31 2025 +0000
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 <dvogel@github>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/drawline.c b/src/drawline.c
index 7db64d0ee..5ad45c6c3 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 df2c7f050..743af8af9 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,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1vJWP9-001DEY-Nq%40256bit.org.
