1
0
forked from aniani/vim

updated for version 7.4.032

Problem:    NFA engine does not match the NUL character. (Jonathon Merz)
Solution:   Ues 0x0a instead of NUL. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar
2013-09-22 13:57:24 +02:00
parent 00462ffb7d
commit 595cad2ea1
4 changed files with 8 additions and 1 deletions

View File

@@ -1383,8 +1383,9 @@ nfa_regatom()
EMSG2_RET_FAIL( EMSG2_RET_FAIL(
_("E678: Invalid character after %s%%[dxouU]"), _("E678: Invalid character after %s%%[dxouU]"),
reg_magic == MAGIC_ALL); reg_magic == MAGIC_ALL);
/* A NUL is stored in the text as NL */
/* TODO: what if a composing character follows? */ /* TODO: what if a composing character follows? */
EMIT(nr); EMIT(nr == 0 ? 0x0a : nr);
} }
break; break;

View File

@@ -373,6 +373,7 @@ STARTTEST
:call add(tl, [2, '\%x20', 'yes no', ' ']) :call add(tl, [2, '\%x20', 'yes no', ' '])
:call add(tl, [2, '\%u0020', 'yes no', ' ']) :call add(tl, [2, '\%u0020', 'yes no', ' '])
:call add(tl, [2, '\%U00000020', 'yes no', ' ']) :call add(tl, [2, '\%U00000020', 'yes no', ' '])
:call add(tl, [2, '\%d0', "yes\x0ano", "\x0a"])
:" :"
:""""" \%[abc] :""""" \%[abc]
:call add(tl, [2, 'foo\%[bar]', 'fobar']) :call add(tl, [2, 'foo\%[bar]', 'fobar'])

View File

@@ -863,6 +863,9 @@ OK 2 - \%u0020
OK 0 - \%U00000020 OK 0 - \%U00000020
OK 1 - \%U00000020 OK 1 - \%U00000020
OK 2 - \%U00000020 OK 2 - \%U00000020
OK 0 - \%d0
OK 1 - \%d0
OK 2 - \%d0
OK 0 - foo\%[bar] OK 0 - foo\%[bar]
OK 1 - foo\%[bar] OK 1 - foo\%[bar]
OK 2 - foo\%[bar] OK 2 - foo\%[bar]

View File

@@ -738,6 +738,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 */
/**/
32,
/**/ /**/
31, 31,
/**/ /**/