summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/regexp_nfa.c6
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index af7994c70..a214b4a3f 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -5510,8 +5510,10 @@ nfa_did_time_out()
*
* When "nfa_endp" is not NULL it is a required end-of-match position.
*
- * Return TRUE if there is a match, FALSE otherwise.
+ * Return TRUE if there is a match, FALSE if there is no match,
+ * NFA_TOO_EXPENSIVE if we end up with too many states.
* When there is a match "submatch" contains the positions.
+ *
* Note: Caller must ensure that: start != NULL.
*/
static int
@@ -5521,7 +5523,7 @@ nfa_regmatch(
regsubs_T *submatch,
regsubs_T *m)
{
- int result;
+ int result = FALSE;
size_t size = 0;
int flag = 0;
int go_to_nextline = FALSE;
diff --git a/src/version.c b/src/version.c
index 70eb2ab37..8322aa44b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1249,
+/**/
1248,
/**/
1247,