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)

diff --git a/src/getchar.c b/src/getchar.c
index 44b246de63d1ece1fdf5e2afbc5a599e50fba75f..3decef3f5abb144edfeaac8b1b19476609095e6b 100644 (file)
--- 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 d9fef0afd0e9463953475c837ffc13a714a24bdc..9b2b0487d5cc9222bbcb558e1c319ac4ae3f7974 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    671,
 /**/
     670,
 /**/