diff options
author | vimboss <devnull@localhost> | 2006-09-10 19:39:25 +0000 |
---|---|---|
committer | vimboss <devnull@localhost> | 2006-09-10 19:39:25 +0000 |
commit | acac55e87e9150edf57f5f3706df2f85089d89e5 (patch) | |
tree | c9c7f25a825dd75a851175caa8dbe3236ea8a011 | |
parent | dc32e051dbd09ac168b3ad2c133dbfe5774081a1 (diff) | |
download | vim-acac55e87e9150edf57f5f3706df2f85089d89e5.tar.gz |
-rw-r--r-- | src/gui.c | 12 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 14 insertions, 0 deletions
@@ -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 acff8abd..33f8f1ad 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, |