sorry. The new file was not included in the patch.
I re-attached.
--
Best regards,
Hirohito Higashi (h_east)
--
--
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 on the web visit
https://groups.google.com/d/msgid/vim_dev/0c6671bb-bbdc-481f-8953-9100689c00e3%40googlegroups.com.
diff --git a/src/popupmenu.c b/src/popupmenu.c
index 55845cf2d..10d367a3b 100644
--- a/src/popupmenu.c
+++ b/src/popupmenu.c
@@ -628,7 +628,7 @@ pum_redraw(void)
void
pum_position_info_popup(win_T *wp)
{
- int col = pum_col + pum_width + 1;
+ int col = pum_col + pum_width + pum_scrollbar + 1;
int row = pum_row;
int botpos = POPPOS_BOTLEFT;
@@ -745,7 +745,7 @@ pum_set_selected(int n, int repeat UNUSED)
#if defined(FEAT_QUICKFIX)
/*
* Show extra info in the preview window if there is something and
- * 'completeopt' contains "preview" or "popup".
+ * 'completeopt' contains "preview" or "popup" or "popuphidden".
* Skip this when tried twice already.
* Skip this also when there is not much room.
* NOTE: Be very careful not to sync undo!
diff --git a/src/testdir/dumps/Test_popupwin_infopopup_6.dump b/src/testdir/dumps/Test_popupwin_infopopup_6.dump
new file mode 100644
index 000000000..18ed96bcb
--- /dev/null
+++ b/src/testdir/dumps/Test_popupwin_infopopup_6.dump
@@ -0,0 +1,14 @@
+|a+0&#ffffff0|w|o|r|d> @17|╔+0&#ffff4012|═@15|X| +0&#ffffff0@33
+|w+0#0000001#e0e0e08|r|d| @4|W| |e|x|t|r|a| |t|e|x|t| @1| +0#0000000#0000001|║+0&#ffff4012| |w|o|r|d|s| |a|r|e| |c|o@1|l| |║| +0#4040ff13#ffffff0@33
+|a+0#0000001#ffd7ff255|n|o|t|w|r|d| |W| |e|x|t|r|a| |t|e|x|t| @1| +0#0000000#0000001|╚+0&#ffff4012|═@15|⇲| +0#4040ff13#ffffff0@33
+|n+0#0000001#ffd7ff255|o|a|w|r|d| @1|W| |e|x|t|r|a| |t|e|x|t| @1| +0#0000000#a8a8a8255| +0#4040ff13#ffffff0@51
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|-+2#0000000&@1| |U|s|e|r| |d|e|f|i|n|e|d| |c|o|m|p|l|e|t|i|o|n| |(|^|U|^|N|^|P|)| |m+0#00e0003&|a|t|c|h| |1| |o|f| |4| +0#0000000&@26
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 041d83465..8ca7f1c57 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -2896,6 +2896,12 @@ func Test_popupmenu_info_border()
call term_sendkeys(buf, "\<C-N>\<C-N>")
call VerifyScreenDump(buf, 'Test_popupwin_infopopup_5', {})
+ " Test that the popupmenu's scrollbar and infopopup do not overlap
+ call term_sendkeys(buf, "\<Esc>")
+ call term_sendkeys(buf, ":set pumheight=3\<CR>")
+ call term_sendkeys(buf, "cc\<C-X>\<C-U>")
+ call VerifyScreenDump(buf, 'Test_popupwin_infopopup_6', {})
+
call StopVimInTerminal(buf)
call delete('XtestInfoPopup')
endfunc
