From b292a2a04c719e2c6352595887eb4d3dd1f689a8 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 9 Feb 2011 18:47:40 +0100 Subject: [PATCH] updated for version 7.3.118 Problem: Ruby uses SIGVTALARM which makes Vim exit. (Alec Tica) Solution: Ignore SIGVTALARM. (Dominique Pelle) --- src/os_unix.c | 4 ++-- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/os_unix.c b/src/os_unix.c index ba86dbf85..0234f90d1 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 10d79adac..d6e5876e2 100644 --- a/src/version.c +++ b/src/version.c @@ -714,6 +714,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 118, /**/ 117, /**/ -- 2.50.1