mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
updated for version 7.1-281
This commit is contained in:
@@ -2137,6 +2137,7 @@ cs_release_csp(i, freefnpp)
|
|||||||
struct sigaction sa, old;
|
struct sigaction sa, old;
|
||||||
|
|
||||||
/* Use sigaction() to limit the waiting time to two seconds. */
|
/* Use sigaction() to limit the waiting time to two seconds. */
|
||||||
|
sigemptyset(&sa.sa_mask);
|
||||||
sa.sa_handler = sig_handler;
|
sa.sa_handler = sig_handler;
|
||||||
sa.sa_flags = SA_NODEFER;
|
sa.sa_flags = SA_NODEFER;
|
||||||
sigaction(SIGALRM, &sa, &old);
|
sigaction(SIGALRM, &sa, &old);
|
||||||
@@ -2169,7 +2170,7 @@ cs_release_csp(i, freefnpp)
|
|||||||
*/
|
*/
|
||||||
if (pid < 0 && csinfo[i].pid > 1)
|
if (pid < 0 && csinfo[i].pid > 1)
|
||||||
{
|
{
|
||||||
kill(csinfo[i].pid, SIGTERM);
|
kill(csinfo[i].pid, SIGKILL);
|
||||||
(void)waitpid(csinfo[i].pid, &pstat, 0);
|
(void)waitpid(csinfo[i].pid, &pstat, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -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 */
|
||||||
|
/**/
|
||||||
|
281,
|
||||||
/**/
|
/**/
|
||||||
280,
|
280,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user