patch 7.4.1523

Problem:    Writing channel to a file fails on MS-Windows.
Solution:   Disable it for now.

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 7b531c8f0ec4b4542f099d625d05d97808c5ad67..3b15568f2ff59831915c663334d5bfe59d8d6604 100644 (file)
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -550,6 +550,10 @@ func Test_nl_write_out_file()
   if !has('job')
     return
   endif
+  " TODO: make this work for MS-Windows
+  if !has('unix')
+    return
+  endif
   call ch_log('Test_nl_write_out_file()')
   let job = job_start(s:python . " test_channel_pipe.py",
        \ {'out-io': 'file', 'out-name': 'Xoutput'})
@@ -571,6 +575,10 @@ func Test_nl_write_err_file()
   if !has('job')
     return
   endif
+  " TODO: make this work for MS-Windows
+  if !has('unix')
+    return
+  endif
   call ch_log('Test_nl_write_err_file()')
   let job = job_start(s:python . " test_channel_pipe.py",
        \ {'err-io': 'file', 'err-name': 'Xoutput'})
@@ -592,6 +600,10 @@ func Test_nl_write_both_file()
   if !has('job')
     return
   endif
+  " TODO: make this work for MS-Windows
+  if !has('unix')
+    return
+  endif
   call ch_log('Test_nl_write_both_file()')
   let job = job_start(s:python . " test_channel_pipe.py",
        \ {'out-io': 'file', 'out-name': 'Xoutput', 'err-io': 'out'})

diff --git a/src/version.c b/src/version.c
index 0c0e5bd0bfaf2cc9844a176760a7e4f326047c96..dffa9f0fd10c3eeed665affcc2712fa71c88552d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1523,
 /**/
     1522,
 /**/