projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| f3c378e8 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.0.090 | |
| 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.090 | |
| 11 | Problem: Cancelling the conform() dialog on the console with Esc requires | |
| 12 | typing it twice. (Benji Fisher) | |
| 13 | Solution: When the start of an escape sequence is found use 'timeoutlen' or | |
| 14 | 'ttimeoutlen'. | |
| 15 | Files: src/misc1.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-7.0.089/src/misc1.c Sun Sep 3 16:39:51 2006 | |
| 19 | --- src/misc1.c Tue Sep 5 20:31:43 2006 | |
| 20 | *************** | |
| 21 | *** 3016,3021 **** | |
| 22 | --- 3016,3022 ---- | |
| 23 | int len = 0; | |
| 24 | int n; | |
| 25 | int save_mapped_ctrl_c = mapped_ctrl_c; | |
| 26 | + int waited = 0; | |
| 27 | ||
| 28 | mapped_ctrl_c = FALSE; /* mappings are not used here */ | |
| 29 | for (;;) | |
| 30 | *************** | |
| 31 | *** 3034,3044 **** | |
| 32 | /* Replace zero and CSI by a special key code. */ | |
| 33 | n = fix_input_buffer(buf + len, n, FALSE); | |
| 34 | len += n; | |
| 35 | } | |
| 36 | ||
| 37 | ! /* incomplete termcode: get more characters */ | |
| 38 | ! if ((n = check_termcode(1, buf, len)) < 0) | |
| 39 | continue; | |
| 40 | /* found a termcode: adjust length */ | |
| 41 | if (n > 0) | |
| 42 | len = n; | |
| 43 | --- 3035,3050 ---- | |
| 44 | /* Replace zero and CSI by a special key code. */ | |
| 45 | n = fix_input_buffer(buf + len, n, FALSE); | |
| 46 | len += n; | |
| 47 | + waited = 0; | |
| 48 | } | |
| 49 | + else if (len > 0) | |
| 50 | + ++waited; /* keep track of the waiting time */ | |
| 51 | ||
| 52 | ! /* Incomplete termcode and not timed out yet: get more characters */ | |
| 53 | ! if ((n = check_termcode(1, buf, len)) < 0 | |
| 54 | ! && (!p_ttimeout || waited * 100L < (p_ttm < 0 ? p_tm : p_ttm))) | |
| 55 | continue; | |
| 56 | + | |
| 57 | /* found a termcode: adjust length */ | |
| 58 | if (n > 0) | |
| 59 | len = n; | |
| 60 | *** ../vim-7.0.089/src/version.c Tue Sep 5 18:28:45 2006 | |
| 61 | --- src/version.c Tue Sep 5 20:49:01 2006 | |
| 62 | *************** | |
| 63 | *** 668,669 **** | |
| 64 | --- 668,671 ---- | |
| 65 | { /* Add new patch number below this line */ | |
| 66 | + /**/ | |
| 67 | + 90, | |
| 68 | /**/ | |
| 69 | ||
| 70 | -- | |
| 71 | GUARD #1: Where'd you get the coconut? | |
| 72 | ARTHUR: We found them. | |
| 73 | GUARD #1: Found them? In Mercea? The coconut's tropical! | |
| 74 | ARTHUR: What do you mean? | |
| 75 | GUARD #1: Well, this is a temperate zone. | |
| 76 | The Quest for the Holy Grail (Monty Python) | |
| 77 | ||
| 78 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 79 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 80 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 81 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |