summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-06-13 22:59:30 +0200
committerBram Moolenaar <Bram@vim.org>2013-06-13 22:59:30 +0200
commit4c46b5e00116420edcd5a75ca97449a6f29bb0fb (patch)
tree873373dba62a73f698135ea9b6de59181efc8f99
parent9d438d3b3862e6cdb4a7b02702f1f82d49bc177d (diff)
downloadvim-git-4c46b5e00116420edcd5a75ca97449a6f29bb0fb.tar.gz
updated for version 7.3.1189v7.3.1189
Problem: Highlighting is still wrong sometimes. (Dominique Pelle) Solution: Also restore reginput properly.
-rw-r--r--src/regexp_nfa.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 20f7aa31b..e843cd742 100644
--- 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 4519fbe69..2c2a00eb5 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 */
/**/
+ 1189,
+/**/
1188,
/**/
1187,