diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2014-11-21 15:34:18 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-11-21 15:41:02 -0300 |
| commit | f09a33bbc131138f67aa13752559ade2d4e577c2 (patch) | |
| tree | d204eca11f8ea4fa128016f68a1bc0f8af62ff18 /src/nvim/edit.c | |
| parent | 230c935e73c0eb8359b18f0da9ce2238cd7830bc (diff) | |
| download | rneovim-f09a33bbc131138f67aa13752559ade2d4e577c2.tar.gz rneovim-f09a33bbc131138f67aa13752559ade2d4e577c2.tar.bz2 rneovim-f09a33bbc131138f67aa13752559ade2d4e577c2.zip | |
event: No longer process K_EVENT automatically
Two new functions, `event_enable_deferred()`/`event_disable_deferred()` have to
be called by code that is capable of handling asynchronicity. User-dialog states
like "press ENTER to continue" or the swap file confirmation no longer will
generate K_EVENT.
Diffstat (limited to 'src/nvim/edit.c')
| -rw-r--r-- | src/nvim/edit.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index d7910347fc..b9ecbc71fe 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -593,9 +593,17 @@ edit ( * Get a character for Insert mode. Ignore K_IGNORE. */ lastc = c; /* remember previous char for CTRL-D */ + event_enable_deferred(); do { c = safe_vgetc(); } while (c == K_IGNORE); + event_disable_deferred(); + + if (c == K_EVENT) { + c = lastc; + event_process(); + continue; + } /* Don't want K_CURSORHOLD for the second key, e.g., after CTRL-V. */ did_cursorhold = TRUE; @@ -943,10 +951,6 @@ doESCkey: did_cursorhold = TRUE; break; - case K_EVENT: - event_process(); - break; - case K_HOME: /* <Home> */ case K_KHOME: case K_S_HOME: |