Mercurial > vim

changeset 6931:f587f6857010 v7.4.784

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 7.4.784 Problem: Using both "noinsert" and "noselect" in 'completeopt' does not work properly. Solution: Change the ins_complete() calls. (Ozaki Kiichi)
author Bram Moolenaar <bram@vim.org>
date Fri, 17 Jul 2015 13:42:23 +0200
parents 7788aaca5954
children 727f3fececd8
files src/edit.c src/version.c
diffstat 2 files changed, 5 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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();
 }
 
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    784,
+/**/
     783,
 /**/
     782,