updated for version 7.3.1184

Problem:    Highlighting is sometimes wrong. (Axel Bender)
Solution:   Fetch regline again when returning from recursive regmatch.

diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 5ad7a07158ea55f5072a6384d842a101bfa151cf..780653f032aa10db5659adc843dcc6d16304896c 100644 (file)
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -4495,7 +4495,6 @@ recursive_regmatch(state, pim, prog, submatch, m, listids)
     int                    **listids;
 {
     char_u     *save_reginput = reginput;
-    char_u     *save_regline = regline;
     int                save_reglnum = reglnum;
     int                save_nfa_match = nfa_match;
     int                save_nfa_listid = nfa_listid;
@@ -4633,8 +4632,9 @@ recursive_regmatch(state, pim, prog, submatch, m, listids)
 
     /* restore position in input text */
     reginput = save_reginput;
-    regline = save_regline;
     reglnum = save_reglnum;
+    if (REG_MULTI)
+       regline = reg_getline(reglnum);
     nfa_match = save_nfa_match;
     nfa_endp = save_nfa_endp;
     nfa_listid = save_nfa_listid;

diff --git a/src/version.c b/src/version.c
index 82569243abd144c4e6fcee88a893aaa2547eb679..f003bbc0aafd46afd16332bcc5b348cbf90cb92e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1184,
 /**/
     1183,
 /**/