diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-10-15 21:16:27 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-10-15 21:16:27 +0300 |
| commit | 76f0466536757fdc7306f92061017b8d51f0ef09 (patch) | |
| tree | aa6334c6afa44ed55c8b60ff869c59744efad993 /src/nvim/edit.c | |
| parent | 3aa2c0d63ae488e302a89fdcdd650404cb2670fd (diff) | |
| parent | 3e502fd7d67f01f8f8e3006da255d3fba40ee961 (diff) | |
| download | rneovim-76f0466536757fdc7306f92061017b8d51f0ef09.tar.gz rneovim-76f0466536757fdc7306f92061017b8d51f0ef09.tar.bz2 rneovim-76f0466536757fdc7306f92061017b8d51f0ef09.zip | |
Merge branch 'master' into expression-parser
Diffstat (limited to 'src/nvim/edit.c')
| -rw-r--r-- | src/nvim/edit.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index e57598fc91..28722a4d10 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -974,14 +974,6 @@ static int insert_handle_key(InsertState *s) multiqueue_process_events(main_loop.events); break; - case K_FOCUSGAINED: // Neovim has been given focus - apply_autocmds(EVENT_FOCUSGAINED, NULL, NULL, false, curbuf); - break; - - case K_FOCUSLOST: // Neovim has lost focus - apply_autocmds(EVENT_FOCUSLOST, NULL, NULL, false, curbuf); - break; - case K_HOME: // <Home> case K_KHOME: case K_S_HOME: @@ -2406,6 +2398,7 @@ void set_completion(colnr_T startcol, list_T *list) ins_compl_prep(' '); } ins_compl_clear(); + ins_compl_free(); compl_direction = FORWARD; if (startcol > curwin->w_cursor.col) @@ -3166,8 +3159,7 @@ static bool ins_compl_prep(int c) /* Ignore end of Select mode mapping and mouse scroll buttons. */ if (c == K_SELECT || c == K_MOUSEDOWN || c == K_MOUSEUP - || c == K_MOUSELEFT || c == K_MOUSERIGHT || c == K_EVENT - || c == K_FOCUSGAINED || c == K_FOCUSLOST) { + || c == K_MOUSELEFT || c == K_MOUSERIGHT || c == K_EVENT) { return retval; } |