aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.1-245

Browse Source
This commit is contained in:
Bram Moolenaar 2008-02-10 21:25:55 +00:00
parent 6f7743ef82
commit ae0f2caeb3
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/os_unix.c
View File

@ -195,6 +195,7 @@ static char_u *extra_shell_arg = NULL;
static int show_shell_mess = TRUE; static int show_shell_mess = TRUE;
#endif #endif
static int deadly_signal = 0; /* The signal we caught */ static int deadly_signal = 0; /* The signal we caught */
static int in_mch_delay = FALSE; /* sleeping in mch_delay() */
static int curr_tmode = TMODE_COOK; /* contains current terminal mode */ static int curr_tmode = TMODE_COOK; /* contains current terminal mode */
@ -538,7 +539,9 @@ mch_delay(msec, ignoreinput)
if (ignoreinput) if (ignoreinput)
{ {
/* Go to cooked mode without echo, to allow SIGINT interrupting us /* Go to cooked mode without echo, to allow SIGINT interrupting us
* here */ * here. But we don't want QUIT to kill us (CTRL-\ used in a
* shell may produce SIGQUIT). */
in_mch_delay = TRUE;
old_tmode = curr_tmode; old_tmode = curr_tmode;
if (curr_tmode == TMODE_RAW) if (curr_tmode == TMODE_RAW)
settmode(TMODE_SLEEP); settmode(TMODE_SLEEP);
@ -602,6 +605,7 @@ mch_delay(msec, ignoreinput)
#endif #endif
settmode(old_tmode); settmode(old_tmode);
in_mch_delay = FALSE;
} }
else else
WaitForChar(msec); WaitForChar(msec);
@ -922,6 +926,14 @@ deathtrap SIGDEFARG(sigarg)
#endif #endif
#ifdef SIGHASARG #ifdef SIGHASARG
# ifdef SIGQUIT
/* While in mch_delay() we go to cooked mode to allow a CTRL-C to
* interrupt us. But in cooked mode we may also get SIGQUIT, e.g., when
* pressing CTRL-\, but we don't want Vim to exit then. */
if (in_mch_delay && sigarg == SIGQUIT)
SIGRETURN;
# endif
/* When SIGHUP, SIGQUIT, etc. are blocked: postpone the effect and return /* When SIGHUP, SIGQUIT, etc. are blocked: postpone the effect and return
* here. This avoids that a non-reentrant function is interrupted, e.g., * here. This avoids that a non-reentrant function is interrupted, e.g.,
* free(). Calling free() again may then cause a crash. */ * free(). Calling free() again may then cause a crash. */

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 */
/**/
245,
/**/ /**/
244, 244,
/**/ /**/