aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

updated for version 7.0-099

Browse Source
This commit is contained in:
Bram Moolenaar
2006-09-10 19:39:25 +00:00
parent 29b2d2694d
commit 05bb82f949
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui.c
View File

@@ -3734,6 +3734,12 @@ gui_drag_scrollbar(sb, value, still_dragging)
if (dont_scroll || input_available()) if (dont_scroll || input_available())
return; return;
#endif #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 #ifdef FEAT_RIGHTLEFT
if (sb->wp == NULL && curwin->w_p_rl) if (sb->wp == NULL && curwin->w_p_rl)
@@ -4208,6 +4214,12 @@ gui_do_scroll()
updateWindow(wp); /* update window, status line, and cmdline */ 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)); return (wp == curwin && !equalpos(curwin->w_cursor, old_cursor));
} }

2
src/version.c
View File

@@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
99,
/**/ /**/
98, 98,
/**/ /**/