Mercurial > vim
comparison src/getchar.c @ 11577:2bc04093ed28 v8.0.0671
patch 8.0.0671: hang when typing CTRL-C in confirm() in timer
commit https://github.com/vim/vim/commit/4eb6531b03445b4d492bc52fea0b6dcd886583af
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jun 24 18:49:00 2017 +0200
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)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 24 Jun 2017 19:00:03 +0200 |
| parents | 6a06738f8948 |
| children | 2738b0cc5f64 |
comparison
equal
deleted
inserted
replaced
| 11576:eb44a241bf39 | 11577:2bc04093ed28 |
|---|---|
| 465 while (inchar(typebuf.tb_buf, typebuf.tb_buflen - 1, 10L, | 465 while (inchar(typebuf.tb_buf, typebuf.tb_buflen - 1, 10L, |
| 466 typebuf.tb_change_cnt) != 0) | 466 typebuf.tb_change_cnt) != 0) |
| 467 ; | 467 ; |
| 468 typebuf.tb_off = MAXMAPLEN; | 468 typebuf.tb_off = MAXMAPLEN; |
| 469 typebuf.tb_len = 0; | 469 typebuf.tb_len = 0; |
| 470 #if defined(FEAT_CLIENTSERVER) || defined(FEAT_EVAL) | |
| 471 /* Reset the flag that text received from a client or from feedkeys() | |
| 472 * was inserted in the typeahead buffer. */ | |
| 473 typebuf_was_filled = FALSE; | |
| 474 #endif | |
| 470 } | 475 } |
| 471 else /* remove mapped characters at the start only */ | 476 else /* remove mapped characters at the start only */ |
| 472 { | 477 { |
| 473 typebuf.tb_off += typebuf.tb_maplen; | 478 typebuf.tb_off += typebuf.tb_maplen; |
| 474 typebuf.tb_len -= typebuf.tb_maplen; | 479 typebuf.tb_len -= typebuf.tb_maplen; |