diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-06-04 17:19:05 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-06-04 17:19:05 +0200 |
| commit | 9155825b2428ef6bf654204a534b033a6879c90d (patch) | |
| tree | 346fc13bf552c741acafadf2762490696271b007 | |
| parent | 30cc44a97f0ba1349e1a522dab22b11f47888183 (diff) | |
| download | vim-git-9155825b2428ef6bf654204a534b033a6879c90d.tar.gz | |
patch 8.2.0900: function list test fails on MS-Windowsv8.2.0900
Problem: Function list test fails on MS-Windows.
Solution: Make sure the fileformat is "unix"
| -rw-r--r-- | src/testdir/test_function_lists.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/testdir/test_function_lists.vim b/src/testdir/test_function_lists.vim index 609b9bff3..fab336395 100644 --- a/src/testdir/test_function_lists.vim +++ b/src/testdir/test_function_lists.vim @@ -50,7 +50,7 @@ func Test_function_lists() %s/^ {"// %s/".*// sort u - w! Xsorted_current_global_functions + w! ++ff=unix Xsorted_current_global_functions " Verify that the ":help functions" list is complete and in ASCII order. @@ -84,7 +84,7 @@ func Test_function_lists() %s/(.*// %left sort u - w! Xfunction-list + w! ++ff=unix Xfunction-list let l:unequal = assert_equalfile("Xsorted_current_global_functions", "Xfunction-list", \ "\":help functions-list\" incomplete") if l:unequal && executable("diff") @@ -92,7 +92,6 @@ func Test_function_lists() endif " Clean up. - call delete("Xglobal_functions") call delete("Xsorted_global_functions") call delete("Xsorted_current_global_functions") diff --git a/src/version.c b/src/version.c index 462e772ec..2c22af411 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 900, +/**/ 899, /**/ 898, |