projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| b62888f4 AF |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.012 | |
| 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 6.2.012 | |
| 11 | Problem: May hang when polling for a character. | |
| 12 | Solution: Break the wait loop when not waiting for a character. | |
| 13 | Files: src/os_unix.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-6.2.011/src/os_unix.c Tue Jun 3 23:14:05 2003 | |
| 17 | --- src/os_unix.c Wed Jun 4 21:08:23 2003 | |
| 18 | *************** | |
| 19 | *** 4108,4114 **** | |
| 20 | } | |
| 21 | # endif | |
| 22 | # ifdef USE_XSMP | |
| 23 | ! if (xsmp_idx >= 0) | |
| 24 | { | |
| 25 | if (fds[xsmp_idx].revents & POLLIN) | |
| 26 | xsmp_handle_requests(); | |
| 27 | --- 4108,4114 ---- | |
| 28 | } | |
| 29 | # endif | |
| 30 | # ifdef USE_XSMP | |
| 31 | ! if (xsmp_idx >= 0 && (fds[gpm_idx].revents & (POLLIN | POLLHUP))) | |
| 32 | { | |
| 33 | if (fds[xsmp_idx].revents & POLLIN) | |
| 34 | xsmp_handle_requests(); | |
| 35 | *************** | |
| 36 | *** 4257,4267 **** | |
| 37 | #endif /* HAVE_SELECT */ | |
| 38 | ||
| 39 | #ifdef MAY_LOOP | |
| 40 | ! if (finished) | |
| 41 | break; | |
| 42 | ||
| 43 | /* We're going to loop around again, find out for how long */ | |
| 44 | ! if (msec >= 0) | |
| 45 | { | |
| 46 | # ifdef USE_START_TV | |
| 47 | struct timeval tv; | |
| 48 | --- 4257,4267 ---- | |
| 49 | #endif /* HAVE_SELECT */ | |
| 50 | ||
| 51 | #ifdef MAY_LOOP | |
| 52 | ! if (finished || msec == 0) | |
| 53 | break; | |
| 54 | ||
| 55 | /* We're going to loop around again, find out for how long */ | |
| 56 | ! if (msec > 0) | |
| 57 | { | |
| 58 | # ifdef USE_START_TV | |
| 59 | struct timeval tv; | |
| 60 | *** ../vim-6.2.011/src/version.c Tue Jun 3 23:14:05 2003 | |
| 61 | --- src/version.c Wed Jun 4 21:09:25 2003 | |
| 62 | *************** | |
| 63 | *** 632,633 **** | |
| 64 | --- 632,635 ---- | |
| 65 | { /* Add new patch number below this line */ | |
| 66 | + /**/ | |
| 67 | + 12, | |
| 68 | /**/ | |
| 69 | ||
| 70 | -- | |
| 71 | From "know your smileys": | |
| 72 | <<<:-{ Worf (Never smiles anyways, so he's a bad smiley) | |
| 73 | ||
| 74 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 75 | /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ | |
| 76 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 77 | \\\ Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html /// |