patch 8.0.1049: shell on Mac can't handle long text

Problem:    Shell on Mac can't handle long text, making terminal test fail.
Solution:   Only write 1000 characters instead of 5000.

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index c70b612953d362f322b8cc0c7534176394b90202..a16f3d906e3229f990f53dbb4cded9309815906b 100644 (file)
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -458,14 +458,16 @@ endfunction
 
 func Test_terminal_noblock()
   let g:buf = term_start(&shell)
+  if has('mac')
+    " The shell or something else has a problem dealing with more than 1000
+    " characters at the same time.
+    let len = 1000
+  else
+    let len = 5000
+  endif
 
   for c in ['a','b','c','d','e','f','g','h','i','j','k']
-    call term_sendkeys(g:buf, 'echo ' . repeat(c, 5000) . "\<cr>")
-    if has('mac')
-      " TODO: this should not be needed, but without it sending keys blocks
-      " after 8000 chars or so.
-      sleep 100m
-    endif
+    call term_sendkeys(g:buf, 'echo ' . repeat(c, len) . "\<cr>")
   endfor
   call term_sendkeys(g:buf, "echo done\<cr>")
 

diff --git a/src/version.c b/src/version.c
index ce53bb81508b39a1ff07e947da4b373bf0b0b7a8..4a5282fd72c0b2eb012061cd70284d2544012908 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1049,
 /**/
     1048,
 /**/