projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 5f6937f1 AM |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.125 | |
| 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.126 | |
| 11 | Problem: Typing CTRL-C at a confirm() prompt doesn't throw an exception. | |
| 12 | Solution: Reset "mapped_ctrl_c" in get_keystroke(), so that "got_int" is set | |
| 13 | in _OnChar(). | |
| 14 | Files: src/misc1.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-6.2.125/src/misc1.c Fri Oct 17 12:08:46 2003 | |
| 18 | --- src/misc1.c Wed Oct 15 11:30:39 2003 | |
| 19 | *************** | |
| 20 | *** 2760,2766 **** | |
| 21 | --- 2760,2768 ---- | |
| 22 | char_u buf[CBUFLEN]; | |
| 23 | int len = 0; | |
| 24 | int n; | |
| 25 | + int save_mapped_ctrl_c = mapped_ctrl_c; | |
| 26 | ||
| 27 | + mapped_ctrl_c = FALSE; /* mappings are not used here */ | |
| 28 | for (;;) | |
| 29 | { | |
| 30 | cursor_on(); | |
| 31 | *************** | |
| 32 | *** 2835,2840 **** | |
| 33 | --- 2837,2844 ---- | |
| 34 | #endif | |
| 35 | break; | |
| 36 | } | |
| 37 | + | |
| 38 | + mapped_ctrl_c = save_mapped_ctrl_c; | |
| 39 | return n; | |
| 40 | } | |
| 41 | ||
| 42 | *** ../vim-6.2.125/src/version.c Fri Oct 17 12:13:28 2003 | |
| 43 | --- src/version.c Fri Oct 17 12:17:16 2003 | |
| 44 | *************** | |
| 45 | *** 639,640 **** | |
| 46 | --- 639,642 ---- | |
| 47 | { /* Add new patch number below this line */ | |
| 48 | + /**/ | |
| 49 | + 126, | |
| 50 | /**/ | |
| 51 | ||
| 52 | -- | |
| 53 | Women are probably the main cause of free software starvation. | |
| 54 | ||
| 55 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 56 | /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ | |
| 57 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 58 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |