From ba2920fe976b37326933afa820616523b509495f Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 6 Mar 2020 21:43:17 +0100
Subject: [PATCH] patch 8.2.0359: popup_atcursor() may hang

Problem:    popup_atcursor() may hang. (Yasuhiro Matsumoto)
Solution:   Take the decoration into account. (closes #5728)
---
 src/popupwin.c                |  5 +++--
 src/testdir/test_popupwin.vim | 13 +++++++++++++
 src/version.c                 |  2 ++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/popupwin.c b/src/popupwin.c
index 45d6488059..3c85e3d567 100644
--- 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
index ebc8c43069..d89824df0d 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -3293,4 +3293,17 @@ func Test_popupwin_filter_input_multibyte()
   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 7e2bd38239..e6c6bc94de 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    359,
 /**/
     358,
 /**/