summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/edit.c12
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 5 deletions
diff --git a/src/edit.c b/src/edit.c
index 080e1ab31..c813d1f89 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -2813,12 +2813,15 @@ set_completion(colnr_T startcol, list_T *list)
compl_cont_status = 0;
compl_curr_match = compl_first_match;
- if (compl_no_insert)
+ if (compl_no_insert || compl_no_select)
+ {
ins_complete(K_DOWN, FALSE);
+ if (compl_no_select)
+ /* Down/Up has no real effect. */
+ ins_complete(K_UP, FALSE);
+ }
else
ins_complete(Ctrl_N, FALSE);
- if (compl_no_select)
- ins_complete(Ctrl_P, FALSE);
/* Lazily show the popup menu, unless we got interrupted. */
if (!compl_interrupted)
@@ -4969,8 +4972,7 @@ ins_compl_check_keys(int frequency)
ins_compl_key2dir(int c)
{
if (c == Ctrl_P || c == Ctrl_L
- || (pum_visible() && (c == K_PAGEUP || c == K_KPAGEUP
- || c == K_S_UP || c == K_UP)))
+ || c == K_PAGEUP || c == K_KPAGEUP || c == K_S_UP || c == K_UP)
return BACKWARD;
return FORWARD;
}
diff --git a/src/version.c b/src/version.c
index 6fdc9da49..6308789d6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1757,
+/**/
1756,
/**/
1755,