| a112d6c4 |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.260 |
| 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.260 |
| 11 | Problem: CursorHold triggers on an incomplete mapping. (Will Gray) |
| 12 | Solution: Don't trigger CursorHold when there is typeahead. |
| 13 | Files: src/fileio.c |
| 14 | |
| 15 | |
| 16 | *** ../vim-7.3.259/src/fileio.c 2011-05-19 17:25:36.000000000 +0200 |
| 17 | --- src/fileio.c 2011-07-20 18:22:16.000000000 +0200 |
| 18 | *************** |
| 19 | *** 9044,9050 **** |
| 20 | { |
| 21 | int state; |
| 22 | |
| 23 | ! if (!did_cursorhold && has_cursorhold() && !Recording |
| 24 | #ifdef FEAT_INS_EXPAND |
| 25 | && !ins_compl_active() |
| 26 | #endif |
| 27 | --- 9044,9053 ---- |
| 28 | { |
| 29 | int state; |
| 30 | |
| 31 | ! if (!did_cursorhold |
| 32 | ! && has_cursorhold() |
| 33 | ! && !Recording |
| 34 | ! && typebuf.tb_len == 0 |
| 35 | #ifdef FEAT_INS_EXPAND |
| 36 | && !ins_compl_active() |
| 37 | #endif |
| 38 | *************** |
| 39 | *** 9935,9940 **** |
| 40 | --- 9938,9945 ---- |
| 41 | if ((c == ';' || c == '>') && match == FALSE) |
| 42 | { |
| 43 | *pattern = NUL; /* Terminate the string */ |
| 44 | + /* TODO: match with 'filetype' of buffer that "fname" comes |
| 45 | + * from. */ |
| 46 | match = mch_check_filetype(fname, type_start); |
| 47 | *pattern = c; /* Restore the terminator */ |
| 48 | type_start = pattern + 1; |
| 49 | *** ../vim-7.3.259/src/version.c 2011-07-20 17:58:14.000000000 +0200 |
| 50 | --- src/version.c 2011-07-20 18:25:15.000000000 +0200 |
| 51 | *************** |
| 52 | *** 711,712 **** |
| 53 | --- 711,714 ---- |
| 54 | { /* Add new patch number below this line */ |
| 55 | + /**/ |
| 56 | + 260, |
| 57 | /**/ |
| 58 | |
| 59 | -- |
| 60 | LAUNCELOT: At last! A call! A cry of distress ... |
| 61 | (he draws his sword, and turns to CONCORDE) |
| 62 | Concorde! Brave, Concorde ... you shall not have died in vain! |
| 63 | CONCORDE: I'm not quite dead, sir ... |
| 64 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD |
| 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 /// |
projects / packages / vim.git / blame