updated for version 7.3.1189

Problem:    Highlighting is still wrong sometimes. (Dominique Pelle)
Solution:   Also restore reginput properly.

diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 20f7aa31b5d429c71e3f2ed085aca98904928b95..e843cd742c71381cab8a6b51035d81bade0a482a 100644 (file)
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -4495,7 +4495,7 @@ recursive_regmatch(state, pim, prog, submatch, m, listids)
     regsubs_T      *m;
     int                    **listids;
 {
-    char_u     *save_reginput = reginput;
+    int                save_reginput_col = (int)(reginput - regline);
     int                save_reglnum = reglnum;
     int                save_nfa_match = nfa_match;
     int                save_nfa_listid = nfa_listid;
@@ -4632,10 +4632,10 @@ recursive_regmatch(state, pim, prog, submatch, m, listids)
     }
 
     /* restore position in input text */
-    reginput = save_reginput;
     reglnum = save_reglnum;
     if (REG_MULTI)
        regline = reg_getline(reglnum);
+    reginput = regline + save_reginput_col;
     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 4519fbe6940b6ad4ae64e1ff6fbc7f5c4848d6ca..2c2a00eb57ea8a8a65b7f74195ba2c5d26c3e7cf 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 */
+/**/
+    1189,
 /**/
     1188,
 /**/