diff options
| author | Shougo Matsushita <Shougo.Matsu@gmail.com> | 2016-07-23 11:23:00 +0900 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-08-01 03:07:49 -0400 |
| commit | 172cf079c7a7f20e557e611d3160962794644a4f (patch) | |
| tree | 3bbe44fcab56631af563ea79f26a15204a895db5 /src/nvim/edit.c | |
| parent | 2cd3a2d1d858e7c39dd59ed09b708d8a38c3d9a5 (diff) | |
| download | rneovim-172cf079c7a7f20e557e611d3160962794644a4f.tar.gz rneovim-172cf079c7a7f20e557e611d3160962794644a4f.tar.bz2 rneovim-172cf079c7a7f20e557e611d3160962794644a4f.zip | |
vim-patch:7.4.2013, vim-patch:7.4.2014
vim-patch:7.4.2013
Problem: Using "noinsert" in 'completeopt' breaks redo.
Solution: Set compl_curr_match. (Shougo, closes vim/vim#874)
https://github.com/vim/vim/commit/67081e50616ae9546621072c5eaaa59bd0a4bed7
vim-patch:7.4.2014
Problem: Using "noinsert" in 'completeopt' does not insert match.
Solution: Set compl_enter_selects. (Shougo, closes #875)
https://github.com/vim/vim/commit/32b808a4bdf35b0dea63c735702a591e5869fecd
Diffstat (limited to 'src/nvim/edit.c')
| -rw-r--r-- | src/nvim/edit.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 03ef41f849..98ec9ae280 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -2385,6 +2385,7 @@ void set_completion(colnr_T startcol, list_T *list) } else { ins_complete(Ctrl_N, false); } + compl_enter_selects = compl_no_insert; // Lazily show the popup menu, unless we got interrupted. if (!compl_interrupted) { @@ -3989,6 +3990,7 @@ static void ins_compl_insert(void) dict_add_nr_str(dict, "info", 0L, EMPTY_IF_NULL(compl_shown_match->cp_text[CPT_INFO])); set_vim_var_dict(VV_COMPLETED_ITEM, dict); + compl_curr_match = compl_shown_match; } /* |