summaryrefslogtreecommitdiff
path: root/src/popupwin.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-03-06 21:43:17 +0100
committerBram Moolenaar <Bram@vim.org>2020-03-06 21:43:17 +0100
commitba2920fe976b37326933afa820616523b509495f (patch)
tree49b8c52752e54eaeed2c3617be1919613e060af0 /src/popupwin.c
parentbd7206e02c957f0619e68e1628e2a3e91dd41e06 (diff)
downloadvim-git-ba2920fe976b37326933afa820616523b509495f.tar.gz
patch 8.2.0359: popup_atcursor() may hangv8.2.0359
Problem: popup_atcursor() may hang. (Yasuhiro Matsumoto) Solution: Take the decoration into account. (closes #5728)
Diffstat (limited to 'src/popupwin.c')
-rw-r--r--src/popupwin.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/popupwin.c b/src/popupwin.c
index 45d648805..3c85e3d56 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;
}
}