updated for version 7.1-183
diff --git a/src/regexp.c b/src/regexp.c
index d61473c..362ae53 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -1288,8 +1288,7 @@
}
/*
- * regbranch - one alternative of an | operator
- *
+ * Handle one alternative of an | operator.
* Implements the & operator.
*/
static char_u *
@@ -1330,8 +1329,7 @@
}
/*
- * 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 @@
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 @@
* 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 db1d34f..36b2f94 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 183,
+/**/
182,
/**/
181,
