From: Bram Moolenaar Date: Thu, 23 May 2013 20:43:08 +0000 (+0200) Subject: updated for version 7.3.1008 X-Git-Tag: v7.3.1008 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02e26d9807295ffddf575f0dd52cf343ab087d33;p=thirdparty%2Fvim.git updated for version 7.3.1008 Problem: Test 95 fails on MS-Windows. Solution: Set 'nomore'. Change \i to \f. Change multi-byte character to something that is not matching \i. (Ken Takata) --- diff --git a/src/testdir/test95.in b/src/testdir/test95.in index 7185c8ecbe..41e3f78b2f 100644 --- a/src/testdir/test95.in +++ b/src/testdir/test95.in @@ -30,10 +30,10 @@ STARTTEST :call add(tl, ['\p\+', 'ìa', 'ìa']) :"""" Test recognition of some character classes -:call add(tl, ['\i\+', '&*§xx ', 'xx']) -:call add(tl, ['\%#=1\i\+', '&*§xx ', 'xx']) +:call add(tl, ['\i\+', '&*¨xx ', 'xx']) +:call add(tl, ['\%#=1\i\+', '&*¨xx ', 'xx']) :call add(tl, ['\f\+', '&*Ÿfname ', 'fname']) -:call add(tl, ['\%#=1\i\+', '&*Ÿfname ', 'fname']) +:call add(tl, ['\%#=1\f\+', '&*Ÿfname ', 'fname']) :"""" Combining different tests and features :call add(tl, ['[^[=a=]]\+', 'ddaãâbcd', 'dd']) diff --git a/src/testdir/test95.ok b/src/testdir/test95.ok index 4a91073c8f..4c1f0ca1d0 100644 --- a/src/testdir/test95.ok +++ b/src/testdir/test95.ok @@ -8,5 +8,5 @@ OK - \p\+ OK - \i\+ OK - \%#=1\i\+ OK - \f\+ -OK - \%#=1\i\+ +OK - \%#=1\f\+ OK - [^[=a=]]\+ diff --git a/src/version.c b/src/version.c index bee106ca42..07bd9dce86 100644 --- a/src/version.c +++ b/src/version.c @@ -728,6 +728,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1008, /**/ 1007, /**/