patch 7.4.1134

Problem:    The arglist test fails on MS-Windows.
Solution:   Only check for failure of argedit on Unix.

diff --git a/src/testdir/test_arglist.vim b/src/testdir/test_arglist.vim
index af92f1565640242ec6eb925a85c4f5300bd12c2f..e1b740306fb7fc8c952f4382aa820b1c30c88135 100644 (file)
--- 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 2d9d5f534647b2762e59c7f08ce266105c5e1439..15f6fa43bd77897d94d6d1e70b4e4a123d12ac2f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1134,
 /**/
     1133,
 /**/