updated for version 7.0-099v7.0.099

2 files changed, 14 insertions, 0 deletions

diff --git a/src/gui.c b/src/gui.c
index 02a14b90d..b8236c6ab 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -3734,6 +3734,12 @@ gui_drag_scrollbar(sb, value, still_dragging)
     if (dont_scroll || input_available())
 	return;
 #endif
+#ifdef FEAT_INS_EXPAND
+    /* Disallow scrolling the current window when the completion popup menu is
+     * visible. */
+    if ((sb->wp == NULL || sb->wp == curwin) && pum_visible())
+	return;
+#endif
 
 #ifdef FEAT_RIGHTLEFT
     if (sb->wp == NULL && curwin->w_p_rl)
@@ -4208,6 +4214,12 @@ gui_do_scroll()
 	updateWindow(wp);   /* update window, status line, and cmdline */
     }
 
+#ifdef FEAT_INS_EXPAND
+    /* May need to redraw the popup menu. */
+    if (pum_visible())
+	pum_redraw();
+#endif
+
     return (wp == curwin && !equalpos(curwin->w_cursor, old_cursor));
 }
 
diff --git a/src/version.c b/src/version.c
index acff8abd7..33f8f1ad0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    99,
+/**/
     98,
 /**/
     97,