From 2cf6938706ebcd20e4b4a6723f5f70568b26b1c6 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar <Bram@vim.org> Date: Fri, 17 Jul 2015 13:42:23 +0200 Subject: [PATCH] patch 7.4.784 Problem: Using both "noinsert" and "noselect" in 'completeopt' does not work properly. Solution: Change the ins_complete() calls. (Ozaki Kiichi) --- src/edit.c | 11 +++-------- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/edit.c b/src/edit.c index 086a5b99e..ca11fd940 100644 --- 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 5a59adde6..4907d68f5 100644 --- 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, /**/ -- 2.40.0