projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 468bf62c AM |
1 | To: vim-dev@vim.org |
| 2 | Subject: patch 7.0.217 | |
| 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.217 | |
| 11 | Problem: This hangs when pressing "n": ":%s/\n/,\r/gc". (Ori Avtalion) | |
| 12 | Solution: Set "skip_match" to advance to the next line. | |
| 13 | Files: src/ex_cmds.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.0.216/src/ex_cmds.c Tue Feb 27 16:51:07 2007 | |
| 17 | --- src/ex_cmds.c Thu Mar 15 21:31:35 2007 | |
| 18 | *************** | |
| 19 | *** 4677,4687 **** | |
| 20 | /* For a multi-line match, put matchcol at the NUL at | |
| 21 | * the end of the line and set nmatch to one, so that | |
| 22 | * we continue looking for a match on the next line. | |
| 23 | ! * Avoids that ":s/\nB\@=//gc" get stuck. */ | |
| 24 | if (nmatch > 1) | |
| 25 | { | |
| 26 | matchcol = (colnr_T)STRLEN(sub_firstline); | |
| 27 | ! nmatch = 1; | |
| 28 | } | |
| 29 | goto skip; | |
| 30 | } | |
| 31 | --- 4677,4688 ---- | |
| 32 | /* For a multi-line match, put matchcol at the NUL at | |
| 33 | * the end of the line and set nmatch to one, so that | |
| 34 | * we continue looking for a match on the next line. | |
| 35 | ! * Avoids that ":%s/\nB\@=//gc" and ":%s/\n/,\r/gc" | |
| 36 | ! * get stuck when pressing 'n'. */ | |
| 37 | if (nmatch > 1) | |
| 38 | { | |
| 39 | matchcol = (colnr_T)STRLEN(sub_firstline); | |
| 40 | ! skip_match = TRUE; | |
| 41 | } | |
| 42 | goto skip; | |
| 43 | } | |
| 44 | *** ../vim-7.0.216/src/version.c Sun Mar 11 15:53:27 2007 | |
| 45 | --- src/version.c Thu Mar 15 21:36:34 2007 | |
| 46 | *************** | |
| 47 | *** 668,669 **** | |
| 48 | --- 668,671 ---- | |
| 49 | { /* Add new patch number below this line */ | |
| 50 | + /**/ | |
| 51 | + 217, | |
| 52 | /**/ | |
| 53 | ||
| 54 | -- | |
| 55 | A mathematician is a device for turning coffee into theorems. | |
| 56 | Paul Erdos | |
| 57 | A computer programmer is a device for turning coffee into bugs. | |
| 58 | Bram Moolenaar | |
| 59 | ||
| 60 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 61 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 62 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 63 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |