]> granicus.if.org Git - vim/commitdiff
updated for version 7.1-281 v7.1.281
authorBram Moolenaar <Bram@vim.org>
Sun, 16 Mar 2008 12:09:58 +0000 (12:09 +0000)
committerBram Moolenaar <Bram@vim.org>
Sun, 16 Mar 2008 12:09:58 +0000 (12:09 +0000)
src/if_cscope.c
src/version.c

index 6efa72b3d06dbf5f08e96455b6c55ffdcd85b4d1..e76b58dd7f9a87a871c3a7abb520e8b2a6a0e458 100644 (file)
@@ -2136,7 +2136,8 @@ cs_release_csp(i, freefnpp)
 # if defined(HAVE_SIGACTION)
        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_flags = SA_NODEFER;
        sigaction(SIGALRM, &sa, &old);
@@ -2169,7 +2170,7 @@ cs_release_csp(i, freefnpp)
         */
        if (pid < 0 && csinfo[i].pid > 1)
        {
-           kill(csinfo[i].pid, SIGTERM);
+           kill(csinfo[i].pid, SIGKILL);
            (void)waitpid(csinfo[i].pid, &pstat, 0);
        }
     }
index 9811dda6aa2f73b3c447f6d1de85f9ac859ea9ad..29951a8dba13c4513bfa50d955130b5a90f2898f 100644 (file)
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    281,
 /**/
     280,
 /**/