diff options
author | ckelsel <ckelsel@hotmail.com> | 2017-09-10 16:43:01 +0800 |
---|---|---|
committer | ckelsel <ckelsel@hotmail.com> | 2017-09-10 16:43:01 +0800 |
commit | af2dd6827299070d81218e9ba54646bfaf53607c (patch) | |
tree | 56345be9219a808efc0f34304f8e873b866a357c /src/nvim/edit.c | |
parent | 70c62d58d53f8d7d213e025f3f432e6521be8680 (diff) | |
parent | d173d48177fd55928a9acd64a06d47371bbb6b09 (diff) | |
download | rneovim-af2dd6827299070d81218e9ba54646bfaf53607c.tar.gz rneovim-af2dd6827299070d81218e9ba54646bfaf53607c.tar.bz2 rneovim-af2dd6827299070d81218e9ba54646bfaf53607c.zip |
Merge remote-tracking branch 'upstream/master'
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 ca62679fab..2bafb77fef 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; } |