From ee7c8d999beb847457f768757b1bdcd76391c1f4 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 22 Sep 2022 12:57:06 +0100 Subject: [PATCH] patch 9.0.0541: terminal pwd test fails with a very long path name Problem: Terminal pwd test fails with a very long path name. Solution: Join two lines. --- src/testdir/test_terminal.vim | 4 +++- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index fd427fe80..e6548079a 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 a9c99e868..654c71c12 100644 --- a/src/version.c +++ b/src/version.c @@ -699,6 +699,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 541, /**/ 540, /**/ -- 2.40.0