diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-01-02 14:35:30 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-01-02 14:35:30 +0000 |
| commit | d42107724b28d1cc9fe0b593ac4e8095238558a2 (patch) | |
| tree | 49991fb0a24426c4be2944238d86da5ce4d90bf2 | |
| parent | f13be0df616260cc99bb04b263318ea4de996642 (diff) | |
| download | vim-git-7.1.183.tar.gz | |
updated for version 7.1-183v7.1.183
| -rw-r--r-- | src/regexp.c | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/regexp.c b/src/regexp.c index d61473c9f..362ae53f3 100644 --- a/src/regexp.c +++ b/src/regexp.c @@ -1288,8 +1288,7 @@ reg(paren, flagp) } /* - * regbranch - one alternative of an | operator - * + * Handle one alternative of an | operator. * Implements the & operator. */ static char_u * @@ -1330,8 +1329,7 @@ regbranch(flagp) } /* - * regbranch - one alternative of an | or & operator - * + * Handle one alternative of an | or & operator. * Implements the concatenation operator. */ static char_u * @@ -1708,6 +1706,8 @@ regatom(flagp) case Magic('|'): case Magic('&'): case Magic(')'): + if (one_exactly) + EMSG_ONE_RET_NULL; EMSG_RET_NULL(_(e_internal)); /* Supposed to be caught earlier. */ /* NOTREACHED */ @@ -3106,7 +3106,7 @@ static colnr_T ireg_maxcol; * slow, we keep one allocated piece of memory and only re-allocate it when * it's too small. It's freed in vim_regexec_both() when finished. */ -static char_u *reg_tofree; +static char_u *reg_tofree = NULL; static unsigned reg_tofreelen; /* diff --git a/src/version.c b/src/version.c index db1d34fd5..36b2f94d5 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 183, +/**/ 182, /**/ 181, |