updated for version 7.0-090

diff --git a/src/misc1.c b/src/misc1.c
index 78caa2081f4c8f6e60cae634d4fcd14251e46fe5..b74ce0de486a516f214e9fc81f04ee0b2375000d 100644 (file)
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -3016,6 +3016,7 @@ get_keystroke()
     int                len = 0;
     int                n;
     int                save_mapped_ctrl_c = mapped_ctrl_c;
+    int                waited = 0;
 
     mapped_ctrl_c = FALSE;     /* mappings are not used here */
     for (;;)
@@ -3034,11 +3035,16 @@ get_keystroke()
            /* Replace zero and CSI by a special key code. */
            n = fix_input_buffer(buf + len, n, FALSE);
            len += n;
+           waited = 0;
        }
+       else if (len > 0)
+           ++waited;       /* keep track of the waiting time */
 
-       /* incomplete termcode: get more characters */
-       if ((n = check_termcode(1, buf, len)) < 0)
+       /* Incomplete termcode and not timed out yet: get more characters */
+       if ((n = check_termcode(1, buf, len)) < 0
+              && (!p_ttimeout || waited * 100L < (p_ttm < 0 ? p_tm : p_ttm)))
            continue;
+
        /* found a termcode: adjust length */
        if (n > 0)
            len = n;

diff --git a/src/version.c b/src/version.c
index 4719a6d5d100181ecf1c9879ec436820448e05c1..0f604a25fb4539a9d5e9c9f910757fbedb25d9fb 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    90,
 /**/
     89,
 /**/