diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-19 13:50:57 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-19 13:50:57 +0100 |
| commit | 82e4184d489e2ce950c871354062fca40bf59598 (patch) | |
| tree | 269c028fdafb672fe21e8c668c958a690a0ff3de | |
| parent | ef26954a35207c3f17d6ed35d9a40c918d974892 (diff) | |
| download | vim-git-82e4184d489e2ce950c871354062fca40bf59598.tar.gz | |
patch 7.4.1134v7.4.1134
Problem: The arglist test fails on MS-Windows.
Solution: Only check for failure of argedit on Unix.
| -rw-r--r-- | src/testdir/test_arglist.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/testdir/test_arglist.vim b/src/testdir/test_arglist.vim index af92f1565..e1b740306 100644 --- a/src/testdir/test_arglist.vim +++ b/src/testdir/test_arglist.vim @@ -226,7 +226,10 @@ function Test_argedit() argedit a call assert_equal(['a', 'b'], argv()) call assert_equal('a', expand('%:t')) - call assert_fails('argedit a b', 'E172:') + if has('unix') + " on MS-Windows this would edit file "a b" + call assert_fails('argedit a b', 'E172:') + endif argedit c call assert_equal(['a', 'c', 'b'], argv()) 0argedit x diff --git a/src/version.c b/src/version.c index 2d9d5f534..15f6fa43b 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1134, +/**/ 1133, /**/ 1132, |