diff options
| -rw-r--r-- | src/testdir/test_terminal.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index fd427fe809..e6548079a9 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -630,7 +630,9 @@ func Test_terminal_cwd() endif call mkdir('Xtermdir') let buf = term_start(cmd, {'cwd': 'Xtermdir'}) - call WaitForAssert({-> assert_equal('Xtermdir', fnamemodify(getline(1), ":t"))}) + " if the path is very long it may be split over two lines, join them + " together + call WaitForAssert({-> assert_equal('Xtermdir', fnamemodify(getline(1) .. getline(2), ":t"))}) exe buf . 'bwipe' call delete('Xtermdir', 'rf') diff --git a/src/version.c b/src/version.c index a9c99e8681..654c71c121 100644 --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 541, +/**/ 540, /**/ 539, |