patch 7.4.784

Problem:    Using both "noinsert" and "noselect" in 'completeopt' does not
            work properly.
Solution:   Change the ins_complete() calls. (Ozaki Kiichi)

diff --git a/src/edit.c b/src/edit.c
index 086a5b99eeb6b6b71c2246c6b0198f0f370a3fd9..ca11fd94048a91900bea9616c74b654637748a60 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -2794,16 +2794,11 @@ set_completion(startcol, list)
 
     compl_curr_match = compl_first_match;
     if (compl_no_insert)
-    {
-       if (!compl_no_select)
-           ins_complete(K_DOWN);
-    }
+       ins_complete(K_DOWN);
     else
-    {
        ins_complete(Ctrl_N);
-       if (compl_no_select)
-           ins_complete(Ctrl_P);
-    }
+    if (compl_no_select)
+       ins_complete(Ctrl_P);
     out_flush();
 }
 

diff --git a/src/version.c b/src/version.c
index 5a59adde65a4ce971c2041afda3429aa4f13e5ba..4907d68f5de3b027b5c514bb71b10c968ef12868 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    784,
 /**/
     783,
 /**/