updated for version 7.0-212

diff --git a/src/ui.c b/src/ui.c
index 41422f12d9697b210d9e7be6ed1040a4decbd211..96785be11f92e37c91847dbb52b9170bc044663d 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -166,10 +166,17 @@ ui_inchar(buf, maxlen, wtime, tb_change_cnt)
     }
 #endif
 
-    /* When doing a blocking wait there is no need for CTRL-C to interrupt
-     * something, don't let it set got_int when it was mapped. */
-    if (mapped_ctrl_c && (wtime == -1 || wtime > 100L))
-       ctrl_c_interrupts = FALSE;
+    /* If we are going to wait for some time or block... */
+    if (wtime == -1 || wtime > 100L)
+    {
+       /* ... allow signals to kill us. */
+       (void)vim_handle_signal(SIGNAL_UNBLOCK);
+
+       /* ... there is no need for CTRL-C to interrupt something, don't let
+        * it set got_int when it was mapped. */
+       if (mapped_ctrl_c)
+           ctrl_c_interrupts = FALSE;
+    }
 
 #ifdef FEAT_GUI
     if (gui.in_use)
@@ -183,16 +190,14 @@ ui_inchar(buf, maxlen, wtime, tb_change_cnt)
     else
 # endif
     {
-       if (wtime == -1 || wtime > 100L)
-           /* allow signals to kill us */
-           (void)vim_handle_signal(SIGNAL_UNBLOCK);
        retval = mch_inchar(buf, maxlen, wtime, tb_change_cnt);
-       if (wtime == -1 || wtime > 100L)
-           /* block SIGHUP et al. */
-           (void)vim_handle_signal(SIGNAL_BLOCK);
     }
 #endif
 
+    if (wtime == -1 || wtime > 100L)
+       /* block SIGHUP et al. */
+       (void)vim_handle_signal(SIGNAL_BLOCK);
+
     ctrl_c_interrupts = TRUE;
 
 #ifdef NO_CONSOLE_INPUT

diff --git a/src/version.c b/src/version.c
index af6f548cb2b76dda7550faf90b9c72c6726a2008..b15235bd48fb8ebf36724f491c5c7855e0fec5dd 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 */
+/**/
+    212,
 /**/
     211,
 /**/