diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-07-16 16:42:13 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-07-16 16:42:13 +0200 |
| commit | 9b50bba643f8d1fcac91e11780da7d03d8995260 (patch) | |
| tree | 02c212edef579e4b76c62c47a81385b862e726e2 | |
| parent | c9041079a199d753e73d3b242f21cc8db620179a (diff) | |
patch 8.0.0723: arglist test fails if file name case is ignoredv8.0.0723
Problem: Arglist test fails if file name case is ignored.
Solution: Wipe existing buffers, check for fname_case property.
| -rw-r--r-- | src/testdir/test_arglist.vim | 25 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 24 insertions, 3 deletions
diff --git a/src/testdir/test_arglist.vim b/src/testdir/test_arglist.vim index 1a0e4aff28..f75bad1c09 100644 --- a/src/testdir/test_arglist.vim +++ b/src/testdir/test_arglist.vim @@ -246,18 +246,37 @@ func Test_argedit() argedit a call assert_equal(['a', 'b', 'a'], argv()) call assert_equal('a', expand('%:t')) + " When file name case is ignored, an existing buffer with only case + " difference is re-used. Make sure they don't exist so the case is + " preserved. + bwipe! c + bwipe! d argedit C D call assert_equal('C', expand('%:t')) call assert_equal(['a', 'b', 'a', 'C', 'D'], argv()) argedit c - call assert_equal(['a', 'b', 'a', 'C', 'c', 'D'], argv()) + if has('fname_case') + call assert_equal(['a', 'b', 'a', 'C', 'c', 'D'], argv()) + else + call assert_equal(['a', 'b', 'a', 'C', 'C', 'D'], argv()) + endif 0argedit x - call assert_equal(['x', 'a', 'b', 'a', 'C', 'c', 'D'], argv()) + if has('fname_case') + call assert_equal(['x', 'a', 'b', 'a', 'C', 'c', 'D'], argv()) + else + call assert_equal(['x', 'a', 'b', 'a', 'C', 'C', 'D'], argv()) + endif enew! | set modified call assert_fails('argedit y', 'E37:') argedit! y - call assert_equal(['x', 'y', 'y', 'a', 'b', 'a', 'C', 'c', 'D'], argv()) + if has('fname_case') + call assert_equal(['x', 'y', 'y', 'a', 'b', 'a', 'C', 'c', 'D'], argv()) + else + call assert_equal(['x', 'y', 'y', 'a', 'b', 'a', 'C', 'C', 'D'], argv()) + endif %argd + bwipe! C + bwipe! D endfunc " Test for the :argdelete command diff --git a/src/version.c b/src/version.c index 91e6deda04..1b2cc8a956 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 723, +/**/ 722, /**/ 721, |