projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| d2415672 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.1.183 | |
| 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.1.183 | |
| 11 | Problem: "Internal error" for ":echo matchstr('a', 'a\%[\&]')" (Mitanu | |
| 12 | Paul) | |
| 13 | Solution: Inside "\%[]" detect \&, \| and \) as an error. | |
| 14 | Files: src/regexp.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.1.182/src/regexp.c Sun Dec 9 19:25:35 2007 | |
| 18 | --- src/regexp.c Wed Jan 2 15:02:37 2008 | |
| 19 | *************** | |
| 20 | *** 1288,1295 **** | |
| 21 | } | |
| 22 | ||
| 23 | /* | |
| 24 | ! * regbranch - one alternative of an | operator | |
| 25 | ! * | |
| 26 | * Implements the & operator. | |
| 27 | */ | |
| 28 | static char_u * | |
| 29 | --- 1288,1294 ---- | |
| 30 | } | |
| 31 | ||
| 32 | /* | |
| 33 | ! * Handle one alternative of an | operator. | |
| 34 | * Implements the & operator. | |
| 35 | */ | |
| 36 | static char_u * | |
| 37 | *************** | |
| 38 | *** 1330,1337 **** | |
| 39 | } | |
| 40 | ||
| 41 | /* | |
| 42 | ! * regbranch - one alternative of an | or & operator | |
| 43 | ! * | |
| 44 | * Implements the concatenation operator. | |
| 45 | */ | |
| 46 | static char_u * | |
| 47 | --- 1329,1335 ---- | |
| 48 | } | |
| 49 | ||
| 50 | /* | |
| 51 | ! * Handle one alternative of an | or & operator. | |
| 52 | * Implements the concatenation operator. | |
| 53 | */ | |
| 54 | static char_u * | |
| 55 | *************** | |
| 56 | *** 1708,1713 **** | |
| 57 | --- 1706,1713 ---- | |
| 58 | case Magic('|'): | |
| 59 | case Magic('&'): | |
| 60 | case Magic(')'): | |
| 61 | + if (one_exactly) | |
| 62 | + EMSG_ONE_RET_NULL; | |
| 63 | EMSG_RET_NULL(_(e_internal)); /* Supposed to be caught earlier. */ | |
| 64 | /* NOTREACHED */ | |
| 65 | ||
| 66 | *************** | |
| 67 | *** 3106,3112 **** | |
| 68 | * slow, we keep one allocated piece of memory and only re-allocate it when | |
| 69 | * it's too small. It's freed in vim_regexec_both() when finished. | |
| 70 | */ | |
| 71 | ! static char_u *reg_tofree; | |
| 72 | static unsigned reg_tofreelen; | |
| 73 | ||
| 74 | /* | |
| 75 | --- 3106,3112 ---- | |
| 76 | * slow, we keep one allocated piece of memory and only re-allocate it when | |
| 77 | * it's too small. It's freed in vim_regexec_both() when finished. | |
| 78 | */ | |
| 79 | ! static char_u *reg_tofree = NULL; | |
| 80 | static unsigned reg_tofreelen; | |
| 81 | ||
| 82 | /* | |
| 83 | *** ../vim-7.1.182/src/version.c Wed Jan 2 15:12:29 2008 | |
| 84 | --- src/version.c Wed Jan 2 15:33:52 2008 | |
| 85 | *************** | |
| 86 | *** 668,669 **** | |
| 87 | --- 668,671 ---- | |
| 88 | { /* Add new patch number below this line */ | |
| 89 | + /**/ | |
| 90 | + 183, | |
| 91 | /**/ | |
| 92 | ||
| 93 | -- | |
| 94 | Not too long ago, unzipping in public was illegal... | |
| 95 | ||
| 96 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 97 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 98 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 99 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |