aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.1.1901: the +insert_expand feature is not always available

Browse Source 
Problem:    The +insert_expand feature is not always available.
Solution:   Graduate the +insert_expand feature.
This commit is contained in:
Bram Moolenaar
2019-08-21 14:37:09 +02:00
parent d933c82ff4
commit e2c453d38f
34 changed files with 85 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui.c
View File

@@ -4019,12 +4019,10 @@ gui_drag_scrollbar(scrollbar_T *sb, long value, int still_dragging)
if (dont_scroll)
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)
@@ -4485,13 +4483,12 @@ gui_do_scroll(void)
{
int type = VALID;
#ifdef FEAT_INS_EXPAND
if (pum_visible())
{
type = NOT_VALID;
wp->w_lines_valid = 0;
}
#endif
/* Don't set must_redraw here, it may cause the popup menu to
* disappear when losing focus after a scrollbar drag. */
if (wp->w_redr_type < type)
@@ -4501,11 +4498,9 @@ gui_do_scroll(void)
mch_enable_flush();
}
#ifdef FEAT_INS_EXPAND
/* May need to redraw the popup menu. */
if (pum_visible())
pum_redraw();
#endif
return (wp == curwin && !EQUAL_POS(curwin->w_cursor, old_cursor));
}