summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/regexp_nfa.c6
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 0bbed878f..157d3ebad 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -679,9 +679,7 @@ nfa_regatom()
/* "\_[" is collection plus newline */
if (c == '[')
- /* TODO: make this work
- * goto collection; */
- return FAIL;
+ goto collection;
/* "\_x" is character class plus newline */
/*FALLTHROUGH*/
@@ -891,8 +889,8 @@ nfa_regatom()
}
break;
-/* collection: */
case Magic('['):
+collection:
/*
* Glue is emitted between several atoms from the [].
* It is either NFA_OR, or NFA_CONCAT.
diff --git a/src/version.c b/src/version.c
index b7c1ddfe7..b8835be3b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1006,
+/**/
1005,
/**/
1004,