summaryrefslogtreecommitdiffstats
path: root/src/getchar.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-06-04 13:32:35 +0200
committerBram Moolenaar <Bram@vim.org>2016-06-04 13:32:35 +0200
commitcda7764d8e65325d4524e5d6c3174121eeb12cad (patch)
tree5f4802c0e68f2a1bcfa57e6e56720b88230d327b /src/getchar.c
parent1aa07bdead2e93501c54591e31fe73b9b09c58b5 (diff)
patch 7.4.1886v7.4.1886
Problem: When waiting for a character is interrupted by receiving channel data and the first character of a mapping was typed, the mapping times out. (Ramel Eshed) Solution: When dealing with channel data don't return from mch_inchar().
Diffstat (limited to 'src/getchar.c')
-rw-r--r--src/getchar.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/getchar.c b/src/getchar.c
index 81cb83794c..56de09470a 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -129,6 +129,7 @@ static int vgetorpeek(int);
static void map_free(mapblock_T **);
static void validate_maphash(void);
static void showmap(mapblock_T *mp, int local);
+static int inchar(char_u *buf, int maxlen, long wait_time, int tb_change_cnt);
#ifdef FEAT_EVAL
static char_u *eval_map_expr(char_u *str, int c);
#endif
@@ -2941,7 +2942,7 @@ vgetorpeek(int advance)
* Return the number of obtained characters.
* Return -1 when end of input script reached.
*/
- int
+ static int
inchar(
char_u *buf,
int maxlen,