updated for version 7.1-183

diff --git a/src/regexp.c b/src/regexp.c
index d61473c9f25b0b7a8fa6da57fa13081fc0c89631..362ae53f3ff95345c2df28ce8309e70feec04efd 100644 (file)
--- 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 db1d34fd5f2f04606e48d9533327820585ad0c2d..36b2f94d5cf0ab1dc4b509e2ffd84e0ede915fc4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    183,
 /**/
     182,
 /**/