patch 7.4.1757

Problem:    When using complete() it may set 'modified' even though nothing
            was inserted.
Solution:   Use Down/Up instead of Next/Previous match. (Shougo, closes #745)

diff --git a/src/edit.c b/src/edit.c
index 080e1ab319d3c60c2321064e3dc05849025a47e4..c813d1f896c2e85ea09e6115b155958fa5151d78 100644 (file)
--- 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 6fdc9da49b2302dd5ad152ad827973faaf29d68b..6308789d6990302123d9df87b115aedf4bec06c5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1757,
 /**/
     1756,
 /**/