0
0
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00

updated for version 7.2-113

This commit is contained in:
Bram Moolenaar 2009-02-21 21:04:20 +00:00
parent fa363cd16f
commit 7670fa0ef1
2 changed files with 6 additions and 6 deletions

View File

@ -4532,7 +4532,7 @@ regmatch(scan)
cleanup_subexpr(); cleanup_subexpr();
if (!REG_MULTI) /* Single-line regexp */ if (!REG_MULTI) /* Single-line regexp */
{ {
if (reg_endp[no] == NULL) if (reg_startp[no] == NULL || reg_endp[no] == NULL)
{ {
/* Backref was not set: Match an empty string. */ /* Backref was not set: Match an empty string. */
len = 0; len = 0;
@ -4548,7 +4548,7 @@ regmatch(scan)
} }
else /* Multi-line regexp */ else /* Multi-line regexp */
{ {
if (reg_endpos[no].lnum < 0) if (reg_startpos[no].lnum < 0 || reg_endpos[no].lnum < 0)
{ {
/* Backref was not set: Match an empty string. */ /* Backref was not set: Match an empty string. */
len = 0; len = 0;
@ -7279,14 +7279,12 @@ reg_submatch(no)
} }
else else
{ {
if (submatch_match->endp[no] == NULL) s = submatch_match->startp[no];
if (s == NULL || submatch_match->endp[no] == NULL)
retval = NULL; retval = NULL;
else else
{
s = submatch_match->startp[no];
retval = vim_strnsave(s, (int)(submatch_match->endp[no] - s)); retval = vim_strnsave(s, (int)(submatch_match->endp[no] - s));
} }
}
return retval; return retval;
} }

View File

@ -676,6 +676,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 */
/**/
113,
/**/ /**/
112, 112,
/**/ /**/