diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-06-24 18:49:00 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-06-24 18:49:00 +0200 |
| commit | 4eb6531b03445b4d492bc52fea0b6dcd886583af (patch) | |
| tree | 856a9590925cfe126d92aaee42f62a16e8d00d63 | |
| parent | 1e8e14552e0cc8881411eb8fbe39a654dae42554 (diff) | |
| download | vim-4eb6531b03445b4d492bc52fea0b6dcd886583af.zip | |
patch 8.0.0671: hang when typing CTRL-C in confirm() in timer
Problem: When a function invoked from a timer calls confirm() and the user
types CTRL-C then Vim hangs.
Solution: Reset typebuf_was_filled. (Ozaki Kiichi, closes #1791)
| -rw-r--r-- | src/getchar.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/getchar.c b/src/getchar.c index 44b246de6..3decef3f5 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -467,6 +467,11 @@ flush_buffers(int flush_typeahead) ; typebuf.tb_off = MAXMAPLEN; typebuf.tb_len = 0; +#if defined(FEAT_CLIENTSERVER) || defined(FEAT_EVAL) + /* Reset the flag that text received from a client or from feedkeys() + * was inserted in the typeahead buffer. */ + typebuf_was_filled = FALSE; +#endif } else /* remove mapped characters at the start only */ { diff --git a/src/version.c b/src/version.c index d9fef0afd..9b2b0487d 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 671, +/**/ 670, /**/ 669, |