diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-07-17 13:42:23 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-07-17 13:42:23 +0200 |
| commit | 2cf6938706ebcd20e4b4a6723f5f70568b26b1c6 (patch) | |
| tree | 3e52e65676a3311003815082a3b3ac3c6c77e01d | |
| parent | 2536d4f396680f079e2cb96f9787a434846b5ce7 (diff) | |
patch 7.4.784v7.4.784
Problem: Using both "noinsert" and "noselect" in 'completeopt' does not
work properly.
Solution: Change the ins_complete() calls. (Ozaki Kiichi)
| -rw-r--r-- | src/edit.c | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/edit.c b/src/edit.c index 086a5b99ee..ca11fd9404 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 5a59adde65..4907d68f5d 100644 --- 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, |