diff options
| author | Bram Moolenaar <Bram@vim.org> | 2011-02-09 18:47:40 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2011-02-09 18:47:40 +0100 |
| commit | b292a2a04c719e2c6352595887eb4d3dd1f689a8 (patch) | |
| tree | d260d1f22a6aadc8e4d4708cdc0c32bee1f5b3b5 | |
| parent | 4e509b6369febbfca15b83c47394d30f7ce5e4a7 (diff) | |
updated for version 7.3.118v7.3.118
Problem: Ruby uses SIGVTALARM which makes Vim exit. (Alec Tica)
Solution: Ignore SIGVTALARM. (Dominique Pelle)
| -rw-r--r-- | src/os_unix.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index ba86dbf850..0234f90d11 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -283,7 +283,7 @@ static struct signalinfo #ifdef SIGTERM {SIGTERM, "TERM", TRUE}, #endif -#ifdef SIGVTALRM +#if defined(SIGVTALRM) && !defined(FEAT_RUBY) {SIGVTALRM, "VTALRM", TRUE}, #endif #if defined(SIGPROF) && !defined(FEAT_MZSCHEME) && !defined(WE_ARE_PROFILING) @@ -1107,7 +1107,7 @@ deathtrap SIGDEFARG(sigarg) * On Linux, signal is not always handled immediately either. * See https://bugs.launchpad.net/bugs/291373 * - * volatile because it is used in in signal handler sigcont_handler(). + * volatile because it is used in signal handler sigcont_handler(). */ static volatile int sigcont_received; static RETSIGTYPE sigcont_handler __ARGS(SIGPROTOARG); diff --git a/src/version.c b/src/version.c index 10d79adac9..d6e5876e2f 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 118, +/**/ 117, /**/ 116, |