aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

updated for version 7.1-183

Browse Source
This commit is contained in:
Bram Moolenaar
2008-01-02 14:35:30 +00:00
parent f13be0df61
commit d42107724b
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/regexp.c
View File

@@ -1288,8 +1288,7 @@ reg(paren, flagp)
} }
/* /*
* regbranch - one alternative of an | operator * Handle one alternative of an | operator.
*
* Implements the & operator. * Implements the & operator.
*/ */
static char_u * 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. * Implements the concatenation operator.
*/ */
static char_u * static char_u *
@@ -1708,6 +1706,8 @@ regatom(flagp)
case Magic('|'): case Magic('|'):
case Magic('&'): case Magic('&'):
case Magic(')'): case Magic(')'):
if (one_exactly)
EMSG_ONE_RET_NULL;
EMSG_RET_NULL(_(e_internal)); /* Supposed to be caught earlier. */ EMSG_RET_NULL(_(e_internal)); /* Supposed to be caught earlier. */
/* NOTREACHED */ /* NOTREACHED */
@@ -3106,7 +3106,7 @@ static colnr_T ireg_maxcol;
* slow, we keep one allocated piece of memory and only re-allocate it when * 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. * 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; static unsigned reg_tofreelen;
/* /*

2
src/version.c
View File

@@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
183,
/**/ /**/
182, 182,
/**/ /**/