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

updated for version 7.1-315

Browse Source
This commit is contained in:
Bram Moolenaar
2008-06-15 12:21:50 +00:00
parent 7d96acd66b
commit fde483c865
2 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/regexp.c
View File

@@ -3044,6 +3044,7 @@ typedef struct regbehind_S
{ {
regsave_T save_after; regsave_T save_after;
regsave_T save_behind; regsave_T save_behind;
int save_need_clear_subexpr;
save_se_T save_start[NSUBEXP]; save_se_T save_start[NSUBEXP];
save_se_T save_end[NSUBEXP]; save_se_T save_end[NSUBEXP];
} regbehind_T; } regbehind_T;
@@ -5858,17 +5859,23 @@ save_subexpr(bp)
{ {
int i; int i;
for (i = 0; i < NSUBEXP; ++i) /* When "need_clear_subexpr" is set we don't need to save the values, only
* remember that this flag needs to be set again when restoring. */
bp->save_need_clear_subexpr = need_clear_subexpr;
if (!need_clear_subexpr)
{ {
if (REG_MULTI) for (i = 0; i < NSUBEXP; ++i)
{ {
bp->save_start[i].se_u.pos = reg_startpos[i]; if (REG_MULTI)
bp->save_end[i].se_u.pos = reg_endpos[i]; {
} bp->save_start[i].se_u.pos = reg_startpos[i];
else bp->save_end[i].se_u.pos = reg_endpos[i];
{ }
bp->save_start[i].se_u.ptr = reg_startp[i]; else
bp->save_end[i].se_u.ptr = reg_endp[i]; {
bp->save_start[i].se_u.ptr = reg_startp[i];
bp->save_end[i].se_u.ptr = reg_endp[i];
}
} }
} }
} }
@@ -5882,17 +5889,22 @@ restore_subexpr(bp)
{ {
int i; int i;
for (i = 0; i < NSUBEXP; ++i) /* Only need to restore saved values when they are not to be cleared. */
need_clear_subexpr = bp->save_need_clear_subexpr;
if (!need_clear_subexpr)
{ {
if (REG_MULTI) for (i = 0; i < NSUBEXP; ++i)
{ {
reg_startpos[i] = bp->save_start[i].se_u.pos; if (REG_MULTI)
reg_endpos[i] = bp->save_end[i].se_u.pos; {
} reg_startpos[i] = bp->save_start[i].se_u.pos;
else reg_endpos[i] = bp->save_end[i].se_u.pos;
{ }
reg_startp[i] = bp->save_start[i].se_u.ptr; else
reg_endp[i] = bp->save_end[i].se_u.ptr; {
reg_startp[i] = bp->save_start[i].se_u.ptr;
reg_endp[i] = bp->save_end[i].se_u.ptr;
}
} }
} }
} }

2
src/version.c
View File

@@ -666,6 +666,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 */
/**/
315,
/**/ /**/
314, 314,
/**/ /**/