diff options
| -rw-r--r-- | src/testdir/dumps/Test_verbose_system_1.vim | 4 | ||||
| -rw-r--r-- | src/testdir/dumps/Test_verbose_system_2.vim | 4 | ||||
| -rw-r--r-- | src/testdir/test_messages.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/src/testdir/dumps/Test_verbose_system_1.vim b/src/testdir/dumps/Test_verbose_system_1.vim index 816a55ae1..65e9c8a37 100644 --- a/src/testdir/dumps/Test_verbose_system_1.vim +++ b/src/testdir/dumps/Test_verbose_system_1.vim @@ -1,3 +1,5 @@ " Filter that removes the ever changing temp directory name from the screendump " that shows the system() command executed. -1s+|t|m|p|/|.|.|.*| |+|t|m|p|/|x|x|x|x|x|x|x|/|1| |+ +" This should be on the first line, but if it isn't there ignore the error, +" the screendump will then show the problem. +1s+|t|m|p|/|.|.|.*| |+|t|m|p|/|x|x|x|x|x|x|x|/|1| |+e diff --git a/src/testdir/dumps/Test_verbose_system_2.vim b/src/testdir/dumps/Test_verbose_system_2.vim index 816a55ae1..65e9c8a37 100644 --- a/src/testdir/dumps/Test_verbose_system_2.vim +++ b/src/testdir/dumps/Test_verbose_system_2.vim @@ -1,3 +1,5 @@ " Filter that removes the ever changing temp directory name from the screendump " that shows the system() command executed. -1s+|t|m|p|/|.|.|.*| |+|t|m|p|/|x|x|x|x|x|x|x|/|1| |+ +" This should be on the first line, but if it isn't there ignore the error, +" the screendump will then show the problem. +1s+|t|m|p|/|.|.|.*| |+|t|m|p|/|x|x|x|x|x|x|x|/|1| |+e diff --git a/src/testdir/test_messages.vim b/src/testdir/test_messages.vim index ab33caad5..ff705fe85 100644 --- a/src/testdir/test_messages.vim +++ b/src/testdir/test_messages.vim @@ -349,7 +349,7 @@ func Test_echo_verbose_system() " display a page and go back, results in exactly the same view call term_sendkeys(buf, ' ') - call TermWait(buf) + call TermWait(buf, 50) call term_sendkeys(buf, 'b') call VerifyScreenDump(buf, 'Test_verbose_system_1', {}) @@ -362,7 +362,7 @@ func Test_echo_verbose_system() call VerifyScreenDump(buf, 'Test_verbose_system_2', {}) call term_sendkeys(buf, ' ') - call TermWait(buf) + call TermWait(buf, 50) call term_sendkeys(buf, 'b') call VerifyScreenDump(buf, 'Test_verbose_system_2', {}) diff --git a/src/version.c b/src/version.c index 5d6a2a42d..115c5991a 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 958, +/**/ 957, /**/ 956, |