updated for version 7.4.008

Problem:    New regexp engine can't be interrupted.
Solution:   Check for CTRL-C pressed. (Yasuhiro Matsumoto)

diff --git a/src/regexp.c b/src/regexp.c
index 06bbb4a540c8676b544934ef954a0c4d353bf8f2..df884e25bd09320bb459d2ef8a4a4d4339f84889 100644 (file)
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -4311,8 +4311,8 @@ regmatch(scan)
    */
   for (;;)
   {
-    /* Some patterns may cause a long time to match, even though they are not
-     * illegal.  E.g., "\([a-z]\+\)\+Q".  Allow breaking them with CTRL-C. */
+    /* Some patterns may take a long time to match, e.g., "\([a-z]\+\)\+Q".
+     * Allow interrupting them with CTRL-C. */
     fast_breakcheck();
 
 #ifdef DEBUG

diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 57539f4e53e65766bd56042156360ed8e88cd68c..5288eb6d3f9a87fe51ac47b93e8a0ae53c998d73 100644 (file)
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -5089,6 +5089,12 @@ nfa_regmatch(prog, start, submatch, m)
        return FALSE;
     }
 #endif
+    /* Some patterns may take a long time to match, especially when using
+     * recursive_regmatch(). Allow interrupting them with CTRL-C. */
+    fast_breakcheck();
+    if (got_int)
+       return FALSE;
+
     nfa_match = FALSE;
 
     /* Allocate memory for the lists of nodes. */

diff --git a/src/version.c b/src/version.c
index d34ed63ddf2c68d2ef11cd47eacc7e41fca1140a..22fc9b961b9ec378e490a496140f42a8c8612278 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -727,6 +727,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    8,
 /**/
     7,
 /**/