aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

updated for version 7.0-212

Browse Source
This commit is contained in:
Bram Moolenaar
2007-03-08 12:36:46 +00:00
parent 9248e6e12e
commit c8da3119cf
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/ui.c
View File

@@ -166,10 +166,17 @@ ui_inchar(buf, maxlen, wtime, tb_change_cnt)
} }
#endif #endif
/* When doing a blocking wait there is no need for CTRL-C to interrupt /* If we are going to wait for some time or block... */
* something, don't let it set got_int when it was mapped. */ if (wtime == -1 || wtime > 100L)
if (mapped_ctrl_c && (wtime == -1 || wtime > 100L)) {
ctrl_c_interrupts = FALSE; /* ... 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 #ifdef FEAT_GUI
if (gui.in_use) if (gui.in_use)
@@ -183,16 +190,14 @@ ui_inchar(buf, maxlen, wtime, tb_change_cnt)
else else
# endif # 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); 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 #endif
if (wtime == -1 || wtime > 100L)
/* block SIGHUP et al. */
(void)vim_handle_signal(SIGNAL_BLOCK);
ctrl_c_interrupts = TRUE; ctrl_c_interrupts = TRUE;
#ifdef NO_CONSOLE_INPUT #ifdef NO_CONSOLE_INPUT

2
src/version.c
View File

@@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
212,
/**/ /**/
211, 211,
/**/ /**/