projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 9b1d76b7 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: patch 7.0.212 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.0.212 | |
| 11 | Problem: The GUI can't be terminated with SIGTERM. (Mark Logan) | |
| 12 | Solution: Use the signal protection in the GUI as in the console, allow | |
| 13 | signals when waiting for 100 msec or longer. | |
| 14 | Files: src/ui.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.0.211/src/ui.c Tue Aug 29 17:28:56 2006 | |
| 18 | --- src/ui.c Thu Mar 8 13:24:17 2007 | |
| 19 | *************** | |
| 20 | *** 166,175 **** | |
| 21 | } | |
| 22 | #endif | |
| 23 | ||
| 24 | ! /* When doing a blocking wait there is no need for CTRL-C to interrupt | |
| 25 | ! * something, don't let it set got_int when it was mapped. */ | |
| 26 | ! if (mapped_ctrl_c && (wtime == -1 || wtime > 100L)) | |
| 27 | ! ctrl_c_interrupts = FALSE; | |
| 28 | ||
| 29 | #ifdef FEAT_GUI | |
| 30 | if (gui.in_use) | |
| 31 | --- 166,182 ---- | |
| 32 | } | |
| 33 | #endif | |
| 34 | ||
| 35 | ! /* If we are going to wait for some time or block... */ | |
| 36 | ! if (wtime == -1 || wtime > 100L) | |
| 37 | ! { | |
| 38 | ! /* ... allow signals to kill us. */ | |
| 39 | ! (void)vim_handle_signal(SIGNAL_UNBLOCK); | |
| 40 | ! | |
| 41 | ! /* ... there is no need for CTRL-C to interrupt something, don't let | |
| 42 | ! * it set got_int when it was mapped. */ | |
| 43 | ! if (mapped_ctrl_c) | |
| 44 | ! ctrl_c_interrupts = FALSE; | |
| 45 | ! } | |
| 46 | ||
| 47 | #ifdef FEAT_GUI | |
| 48 | if (gui.in_use) | |
| 49 | *************** | |
| 50 | *** 183,198 **** | |
| 51 | else | |
| 52 | # endif | |
| 53 | { | |
| 54 | - if (wtime == -1 || wtime > 100L) | |
| 55 | - /* allow signals to kill us */ | |
| 56 | - (void)vim_handle_signal(SIGNAL_UNBLOCK); | |
| 57 | retval = mch_inchar(buf, maxlen, wtime, tb_change_cnt); | |
| 58 | - if (wtime == -1 || wtime > 100L) | |
| 59 | - /* block SIGHUP et al. */ | |
| 60 | - (void)vim_handle_signal(SIGNAL_BLOCK); | |
| 61 | } | |
| 62 | #endif | |
| 63 | ||
| 64 | ctrl_c_interrupts = TRUE; | |
| 65 | ||
| 66 | #ifdef NO_CONSOLE_INPUT | |
| 67 | --- 190,203 ---- | |
| 68 | else | |
| 69 | # endif | |
| 70 | { | |
| 71 | retval = mch_inchar(buf, maxlen, wtime, tb_change_cnt); | |
| 72 | } | |
| 73 | #endif | |
| 74 | ||
| 75 | + if (wtime == -1 || wtime > 100L) | |
| 76 | + /* block SIGHUP et al. */ | |
| 77 | + (void)vim_handle_signal(SIGNAL_BLOCK); | |
| 78 | + | |
| 79 | ctrl_c_interrupts = TRUE; | |
| 80 | ||
| 81 | #ifdef NO_CONSOLE_INPUT | |
| 82 | *** ../vim-7.0.211/src/version.c Thu Mar 8 13:15:08 2007 | |
| 83 | --- src/version.c Thu Mar 8 13:37:06 2007 | |
| 84 | *************** | |
| 85 | *** 668,669 **** | |
| 86 | --- 668,671 ---- | |
| 87 | { /* Add new patch number below this line */ | |
| 88 | + /**/ | |
| 89 | + 212, | |
| 90 | /**/ | |
| 91 | ||
| 92 | -- | |
| 93 | This is an airconditioned room, do not open Windows. | |
| 94 | ||
| 95 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 96 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 97 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 98 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |