summaryrefslogtreecommitdiff
path: root/src/gui.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-08-21 14:37:09 +0200
committerBram Moolenaar <Bram@vim.org>2019-08-21 14:37:09 +0200
commite2c453d38f6512ac4cff7cd26aa7780b4e2534d7 (patch)
tree8458a35d59ac43121bfd2d24d5e9f7f54969d0dc /src/gui.c
parentd933c82ff4e2c910bd533ed9a50377699c3f5ec9 (diff)
downloadvim-git-e2c453d38f6512ac4cff7cd26aa7780b4e2534d7.tar.gz
patch 8.1.1901: the +insert_expand feature is not always availablev8.1.1901
Problem: The +insert_expand feature is not always available. Solution: Graduate the +insert_expand feature.
Diffstat (limited to 'src/gui.c')
-rw-r--r--src/gui.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/gui.c b/src/gui.c
index bb35f5102..d9e7e47a0 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -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));
}