# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1583527503 -3600
# Node ID 5ad7a406647a260cc5c75ad31ffb2e74330b3aee
# Parent  5ca07850fef0f7c3e3cd7efdc27ad6a01d011e1f
patch 8.2.0359: popup_atcursor() may hang

Commit: https://github.com/vim/vim/commit/ba2920fe976b37326933afa820616523b509495f
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Mar 6 21:43:17 2020 +0100

    patch 8.2.0359: popup_atcursor() may hang

    Problem:    popup_atcursor() may hang. (Yasuhiro Matsumoto)
    Solution:   Take the decoration into account. (closes https://github.com/vim/vim/issues/5728)

diff --git a/src/popupwin.c b/src/popupwin.c
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -1232,8 +1232,9 @@ popup_adjust_position(win_T *wp)
 		|| 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
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -3293,4 +3293,17 @@ func Test_popupwin_filter_input_multibyt
   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
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    359,
+/**/
     358,
 /**/
     357,