forked from aniani/vim
updated for version 7.3.1152
Problem: In tiny build ireg_icombine is undefined. (Tony Mechelynck) Solution: Add #ifdef.
This commit is contained in:
@@ -6198,7 +6198,11 @@ nfa_regexec_both(line, startcol)
|
|||||||
|
|
||||||
/* If match_text is set it contains the full text that must match.
|
/* If match_text is set it contains the full text that must match.
|
||||||
* Nothing else to try. Doesn't handle combining chars well. */
|
* Nothing else to try. Doesn't handle combining chars well. */
|
||||||
if (prog->match_text != NULL && !ireg_icombine)
|
if (prog->match_text != NULL
|
||||||
|
#ifdef FEAT_MBYTE
|
||||||
|
&& !ireg_icombine
|
||||||
|
#endif
|
||||||
|
)
|
||||||
return find_match_text(col, prog->regstart, prog->match_text);
|
return find_match_text(col, prog->regstart, prog->match_text);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -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 */
|
||||||
|
/**/
|
||||||
|
1152,
|
||||||
/**/
|
/**/
|
||||||
1151,
|
1151,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user