|
 |
d6ba96 |
To: vim_dev@googlegroups.com
|
|
|
d6ba96 |
Subject: Patch 7.4.032
|
|
|
d6ba96 |
Fcc: outbox
|
|
|
d6ba96 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
d6ba96 |
Mime-Version: 1.0
|
|
|
d6ba96 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d6ba96 |
Content-Transfer-Encoding: 8bit
|
|
|
d6ba96 |
------------
|
|
|
d6ba96 |
|
|
|
d6ba96 |
Patch 7.4.032
|
|
|
d6ba96 |
Problem: NFA engine does not match the NUL character. (Jonathon Merz)
|
|
|
d6ba96 |
Solution: Ues 0x0a instead of NUL. (Christian Brabandt)
|
|
|
d6ba96 |
Files: src/regexp_nfa.c, src/testdir/test64.in, src/testdir/test64.ok
|
|
|
d6ba96 |
|
|
|
d6ba96 |
|
|
|
d6ba96 |
*** ../vim-7.4.031/src/regexp_nfa.c 2013-09-19 17:00:14.000000000 +0200
|
|
|
d6ba96 |
--- src/regexp_nfa.c 2013-09-22 13:53:46.000000000 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 1383,1390 ****
|
|
|
d6ba96 |
EMSG2_RET_FAIL(
|
|
|
d6ba96 |
_("E678: Invalid character after %s%%[dxouU]"),
|
|
|
d6ba96 |
reg_magic == MAGIC_ALL);
|
|
|
d6ba96 |
/* TODO: what if a composing character follows? */
|
|
|
d6ba96 |
! EMIT(nr);
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
break;
|
|
|
d6ba96 |
|
|
|
d6ba96 |
--- 1383,1391 ----
|
|
|
d6ba96 |
EMSG2_RET_FAIL(
|
|
|
d6ba96 |
_("E678: Invalid character after %s%%[dxouU]"),
|
|
|
d6ba96 |
reg_magic == MAGIC_ALL);
|
|
|
d6ba96 |
+ /* A NUL is stored in the text as NL */
|
|
|
d6ba96 |
/* TODO: what if a composing character follows? */
|
|
|
d6ba96 |
! EMIT(nr == 0 ? 0x0a : nr);
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
break;
|
|
|
d6ba96 |
|
|
|
d6ba96 |
*** ../vim-7.4.031/src/testdir/test64.in 2013-09-05 21:15:38.000000000 +0200
|
|
|
d6ba96 |
--- src/testdir/test64.in 2013-09-22 13:51:53.000000000 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 373,378 ****
|
|
|
d6ba96 |
--- 373,379 ----
|
|
|
d6ba96 |
:call add(tl, [2, '\%x20', 'yes no', ' '])
|
|
|
d6ba96 |
:call add(tl, [2, '\%u0020', 'yes no', ' '])
|
|
|
d6ba96 |
:call add(tl, [2, '\%U00000020', 'yes no', ' '])
|
|
|
d6ba96 |
+ :call add(tl, [2, '\%d0', "yes\x0ano", "\x0a"])
|
|
|
d6ba96 |
:"
|
|
|
d6ba96 |
:""""" \%[abc]
|
|
|
d6ba96 |
:call add(tl, [2, 'foo\%[bar]', 'fobar'])
|
|
|
d6ba96 |
*** ../vim-7.4.031/src/testdir/test64.ok 2013-09-05 21:15:38.000000000 +0200
|
|
|
d6ba96 |
--- src/testdir/test64.ok 2013-09-22 13:52:41.000000000 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 863,868 ****
|
|
|
d6ba96 |
--- 863,871 ----
|
|
|
d6ba96 |
OK 0 - \%U00000020
|
|
|
d6ba96 |
OK 1 - \%U00000020
|
|
|
d6ba96 |
OK 2 - \%U00000020
|
|
|
d6ba96 |
+ OK 0 - \%d0
|
|
|
d6ba96 |
+ OK 1 - \%d0
|
|
|
d6ba96 |
+ OK 2 - \%d0
|
|
|
d6ba96 |
OK 0 - foo\%[bar]
|
|
|
d6ba96 |
OK 1 - foo\%[bar]
|
|
|
d6ba96 |
OK 2 - foo\%[bar]
|
|
|
d6ba96 |
*** ../vim-7.4.031/src/version.c 2013-09-20 20:13:48.000000000 +0200
|
|
|
d6ba96 |
--- src/version.c 2013-09-22 13:56:45.000000000 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 740,741 ****
|
|
|
d6ba96 |
--- 740,743 ----
|
|
|
d6ba96 |
{ /* Add new patch number below this line */
|
|
|
d6ba96 |
+ /**/
|
|
|
d6ba96 |
+ 32,
|
|
|
d6ba96 |
/**/
|
|
|
d6ba96 |
|
|
|
d6ba96 |
--
|
|
|
d6ba96 |
hundred-and-one symptoms of being an internet addict:
|
|
|
d6ba96 |
247. You use www.switchboard.com instead of dialing 411 and 555-12-12
|
|
|
d6ba96 |
for directory assistance.
|
|
|
d6ba96 |
|
|
|
d6ba96 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
d6ba96 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
d6ba96 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
d6ba96 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|