diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-06-13 19:47:07 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-06-13 19:47:07 +0200 |
| commit | 484d241a4abb4a7e892fbb1e3afb269890526e5a (patch) | |
| tree | 70922926b37e0b8e8f72d14467c15ab1e6b1bff5 | |
| parent | 98bfc2d5eeff2e83c41cef3b3cefff63cda574df (diff) | |
| download | vim-git-484d241a4abb4a7e892fbb1e3afb269890526e5a.tar.gz | |
updated for version 7.3.1184v7.3.1184
Problem: Highlighting is sometimes wrong. (Axel Bender)
Solution: Fetch regline again when returning from recursive regmatch.
| -rw-r--r-- | src/regexp_nfa.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c index 5ad7a0715..780653f03 100644 --- 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 82569243a..f003bbc0a 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 */ /**/ + 1184, +/**/ 1183, /**/ 1182, |