projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 57d93a78 ER |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.118 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.3.118 | |
| 11 | Problem: Ruby uses SIGVTALARM which makes Vim exit. (Alec Tica) | |
| 12 | Solution: Ignore SIGVTALARM. (Dominique Pelle) | |
| 13 | Files: src/os_unix.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.3.117/src/os_unix.c 2010-12-17 16:27:10.000000000 +0100 | |
| 17 | --- src/os_unix.c 2011-02-09 18:19:57.000000000 +0100 | |
| 18 | *************** | |
| 19 | *** 283,289 **** | |
| 20 | #ifdef SIGTERM | |
| 21 | {SIGTERM, "TERM", TRUE}, | |
| 22 | #endif | |
| 23 | ! #ifdef SIGVTALRM | |
| 24 | {SIGVTALRM, "VTALRM", TRUE}, | |
| 25 | #endif | |
| 26 | #if defined(SIGPROF) && !defined(FEAT_MZSCHEME) && !defined(WE_ARE_PROFILING) | |
| 27 | --- 283,289 ---- | |
| 28 | #ifdef SIGTERM | |
| 29 | {SIGTERM, "TERM", TRUE}, | |
| 30 | #endif | |
| 31 | ! #if defined(SIGVTALRM) && !defined(FEAT_RUBY) | |
| 32 | {SIGVTALRM, "VTALRM", TRUE}, | |
| 33 | #endif | |
| 34 | #if defined(SIGPROF) && !defined(FEAT_MZSCHEME) && !defined(WE_ARE_PROFILING) | |
| 35 | *************** | |
| 36 | *** 1107,1113 **** | |
| 37 | * On Linux, signal is not always handled immediately either. | |
| 38 | * See https://bugs.launchpad.net/bugs/291373 | |
| 39 | * | |
| 40 | ! * volatile because it is used in in signal handler sigcont_handler(). | |
| 41 | */ | |
| 42 | static volatile int sigcont_received; | |
| 43 | static RETSIGTYPE sigcont_handler __ARGS(SIGPROTOARG); | |
| 44 | --- 1107,1113 ---- | |
| 45 | * On Linux, signal is not always handled immediately either. | |
| 46 | * See https://bugs.launchpad.net/bugs/291373 | |
| 47 | * | |
| 48 | ! * volatile because it is used in signal handler sigcont_handler(). | |
| 49 | */ | |
| 50 | static volatile int sigcont_received; | |
| 51 | static RETSIGTYPE sigcont_handler __ARGS(SIGPROTOARG); | |
| 52 | *** ../vim-7.3.117/src/version.c 2011-02-09 17:42:53.000000000 +0100 | |
| 53 | --- src/version.c 2011-02-09 18:46:53.000000000 +0100 | |
| 54 | *************** | |
| 55 | *** 716,717 **** | |
| 56 | --- 716,719 ---- | |
| 57 | { /* Add new patch number below this line */ | |
| 58 | + /**/ | |
| 59 | + 118, | |
| 60 | /**/ | |
| 61 | ||
| 62 | -- | |
| 63 | hundred-and-one symptoms of being an internet addict: | |
| 64 | 221. Your wife melts your keyboard in the oven. | |
| 65 | ||
| 66 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 67 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 68 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 69 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |