From: Bram Moolenaar <Bram@vim.org> Date: Wed, 17 Jul 2013 20:35:39 +0000 (+0200) Subject: updated for version 7.4a.035 X-Git-Tag: v7.4a.035 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e53c8616f1ef72235747fe28b829d971aa2cdf7f;p=vim updated for version 7.4a.035 Problem: Fix in patch 7.4a.032 is not tested. Solution: Add test. --- diff --git a/src/testdir/test64.in b/src/testdir/test64.in index c414c6e76..ec6107fb1 100644 --- a/src/testdir/test64.in +++ b/src/testdir/test64.in @@ -339,6 +339,7 @@ STARTTEST :call add(tl, [2, '^\%(.*bar\)\@!.*\zsfoo', ' foo bar ']) :call add(tl, [2, '^\%(.*bar\)\@!.*\zsfoo', ' foo xxx ', 'foo']) :call add(tl, [2, '[ ]\@!\p\%([ ]\@!\p\)*:', 'implicit mappings:', 'mappings:']) +:call add(tl, [2, 'm\k\+_\@=\%(_\@!\k\)\@<=\k\+e', 'mx__xe', 'mx__xe']) :" :"""" Combining different tests and features :call add(tl, [2, '[[:alpha:]]\{-2,6}', '787abcdiuhsasiuhb4', 'ab']) diff --git a/src/testdir/test64.ok b/src/testdir/test64.ok index 8ac9e32cb..4203c8f39 100644 --- a/src/testdir/test64.ok +++ b/src/testdir/test64.ok @@ -773,6 +773,9 @@ OK 2 - ^\%(.*bar\)\@!.*\zsfoo OK 0 - [ ]\@!\p\%([ ]\@!\p\)*: OK 1 - [ ]\@!\p\%([ ]\@!\p\)*: OK 2 - [ ]\@!\p\%([ ]\@!\p\)*: +OK 0 - m\k\+_\@=\%(_\@!\k\)\@<=\k\+e +OK 1 - m\k\+_\@=\%(_\@!\k\)\@<=\k\+e +OK 2 - m\k\+_\@=\%(_\@!\k\)\@<=\k\+e OK 0 - [[:alpha:]]\{-2,6} OK 1 - [[:alpha:]]\{-2,6} OK 2 - [[:alpha:]]\{-2,6} diff --git a/src/version.c b/src/version.c index 3dadcaf77..04f05b038 100644 --- a/src/version.c +++ b/src/version.c @@ -727,6 +727,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 35, /**/ 34, /**/