patch 8.2.0359: popup_atcursor() may hang
Problem: popup_atcursor() may hang. (Yasuhiro Matsumoto)
Solution: Take the decoration into account. (closes #5728)
diff --git a/src/popupwin.c b/src/popupwin.c
index 45d6488..3c85e3d 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -1232,8 +1232,9 @@
|| wp->w_popup_pos == POPPOS_BOTLEFT))
{
wp->w_wincol = wantcol - 1;
- if (wp->w_wincol >= Columns - 1)
- wp->w_wincol = Columns - 1;
+ // Need to see at least one character after the decoration.
+ if (wp->w_wincol > Columns - left_extra - 1)
+ wp->w_wincol = Columns - left_extra - 1;
}
}
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index ebc8c43..d89824d 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -3293,4 +3293,17 @@
unlet g:bytes
endfunc
+func Test_popupwin_atcursor_far_right()
+ new
+
+ " this was getting stuck
+ set signcolumn=yes
+ call setline(1, repeat('=', &columns))
+ normal! ggg$
+ call popup_atcursor(repeat('x', 500), #{moved: 'any', border: []})
+
+ bwipe!
+ set signcolumn&
+endfunc
+
" vim: shiftwidth=2 sts=2
diff --git a/src/version.c b/src/version.c
index 7e2bd38..e6c6bc9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 359,
+/**/
358,
/**/
357,