summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-19 14:14:08 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-19 14:14:08 +0100
commit301417041bdb15264a9c8ff20e4fea4dcc12c478 (patch)
tree8302dc597572efb6e4090630bd60286185c3d7d5
parent82e4184d489e2ce950c871354062fca40bf59598 (diff)
patch 7.4.1135v7.4.1135
Problem: One more arglist test fails on MS-Windows. Solution: Don't edit "Y" after editing "y".
-rw-r--r--src/testdir/test_arglist.vim4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_arglist.vim b/src/testdir/test_arglist.vim
index e1b740306f..281ac7ad44 100644
--- a/src/testdir/test_arglist.vim
+++ b/src/testdir/test_arglist.vim
@@ -120,8 +120,8 @@ function Test_argument()
$arga x
call assert_equal(['a', 'b', 'c', 'x'], argv())
- 0arga Y
- call assert_equal(['Y', 'a', 'b', 'c', 'x'], argv())
+ 0arga y
+ call assert_equal(['y', 'a', 'b', 'c', 'x'], argv())
%argd
call assert_equal([], argv())
diff --git a/src/version.c b/src/version.c
index 15f6fa43bd..843e7414ca 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 */
/**/
+ 1135,
+/**/
1134,
/**/
1133,