Mercurial > vim
changeset 1468:200b706675a5 v7.1.183
updated for version 7.1-183
author | vimboss |
---|---|
date | Wed, 02 Jan 2008 14:35:30 +0000 |
parents | 198ea7a9c633 |
children | 88c0c6c9eada |
files | src/regexp.c src/version.c |
diffstat | 2 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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; /*