thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.3.1184

Browse Source 
Problem:    Highlighting is sometimes wrong. (Axel Bender)
Solution:   Fetch regline again when returning from recursive regmatch.
This commit is contained in:
Bram Moolenaar
2013-06-13 19:47:07 +02:00
parent 98bfc2d5ee
commit 484d241a4a
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/regexp_nfa.c
View File

@@ -4495,7 +4495,6 @@ recursive_regmatch(state, pim, prog, submatch, m, listids)
int **listids; int **listids;
{ {
char_u *save_reginput = reginput; char_u *save_reginput = reginput;
char_u *save_regline = regline;
int save_reglnum = reglnum; int save_reglnum = reglnum;
int save_nfa_match = nfa_match; int save_nfa_match = nfa_match;
int save_nfa_listid = nfa_listid; int save_nfa_listid = nfa_listid;
@@ -4633,8 +4632,9 @@ recursive_regmatch(state, pim, prog, submatch, m, listids)
/* restore position in input text */ /* restore position in input text */
reginput = save_reginput; reginput = save_reginput;
regline = save_regline;
reglnum = save_reglnum; reglnum = save_reglnum;
if (REG_MULTI)
regline = reg_getline(reglnum);
nfa_match = save_nfa_match; nfa_match = save_nfa_match;
nfa_endp = save_nfa_endp; nfa_endp = save_nfa_endp;
nfa_listid = save_nfa_listid; nfa_listid = save_nfa_listid;

2
src/version.c
View File

@@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1184,
/**/ /**/
1183, 1183,
/**/ /**/