diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2014-10-22 11:40:38 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-10-22 11:40:38 -0300 |
| commit | 2f31c3d6ce665ea9aceea700b29858e6e2bc7e62 (patch) | |
| tree | 059e5ccf4d4173cc8bc335cd553941ed23e43147 /src/nvim/os | |
| parent | 5cd9b6474287650790e97187058c81b176fbc7c9 (diff) | |
| parent | b31a74ad11c8943b795d132c7d3e3c961d048118 (diff) | |
| download | rneovim-2f31c3d6ce665ea9aceea700b29858e6e2bc7e62.tar.gz rneovim-2f31c3d6ce665ea9aceea700b29858e6e2bc7e62.tar.bz2 rneovim-2f31c3d6ce665ea9aceea700b29858e6e2bc7e62.zip | |
Merge PR #1326 'Add verification of log macros'
Diffstat (limited to 'src/nvim/os')
| -rw-r--r-- | src/nvim/os/input.c | 4 | ||||
| -rw-r--r-- | src/nvim/os/rstream.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/nvim/os/input.c b/src/nvim/os/input.c index b7eba47d5e..2c8026d099 100644 --- a/src/nvim/os/input.c +++ b/src/nvim/os/input.c @@ -264,15 +264,15 @@ static void convert_input(void) for (int i = (int)count - 1; i >= 0; i--) { if (inbuf[i] == 3) { + got_int = true; consume_count = (size_t)i; break; } } - if (consume_count) { + if (got_int) { // Remove everything typed before the CTRL-C rbuffer_consumed(input_buffer, consume_count); - got_int = true; } } diff --git a/src/nvim/os/rstream.c b/src/nvim/os/rstream.c index 8cfd9d1b75..d96b3d931c 100644 --- a/src/nvim/os/rstream.c +++ b/src/nvim/os/rstream.c @@ -73,13 +73,14 @@ void rbuffer_consumed(RBuffer *rbuffer, size_t count) void rbuffer_produced(RBuffer *rbuffer, size_t count) { rbuffer->wpos += count; - DLOG("Received %u bytes from RStream(%p)", (size_t)cnt, rbuffer->rstream); + DLOG("Received %u bytes from RStream(%p)", (size_t)count, rbuffer->rstream); rbuffer_relocate(rbuffer); if (rbuffer->rstream && rbuffer->wpos == rbuffer->capacity) { // The last read filled the buffer, stop reading for now + // rstream_stop(rbuffer->rstream); - DLOG("Buffer for RStream(%p) is full, stopping it", rstream); + DLOG("Buffer for RStream(%p) is full, stopping it", rbuffer->rstream); } } |