diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2019-06-04 09:14:45 +0200 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2019-06-04 09:14:45 +0200 |
commit | 58f505dc7432cad76269ee447029eb1ad94b5aeb (patch) | |
tree | 2f4e2176d828c8caeacef2b3bb5db187564a8bf5 /test | |
parent | 16b1e8f9c070ad853c6c63b43591e297bf512662 (diff) | |
parent | 4719fdb3a44677cc1127624478f67a5316452aa0 (diff) | |
download | rneovim-58f505dc7432cad76269ee447029eb1ad94b5aeb.tar.gz rneovim-58f505dc7432cad76269ee447029eb1ad94b5aeb.tar.bz2 rneovim-58f505dc7432cad76269ee447029eb1ad94b5aeb.zip |
Merge #9829 'startup: remove TUI init special-case'
fixes #7967
fixes #9959
Historically Vim/Nvim does backflips to handle input and show messages
before a UI is available. This logical contradiction was already fixed
for remote UIs (#9024 c236e80cf3df). Fixing it also for the TUI avoids
problems on Windows, simplifies the logic, and avoids races like #9959.
- Move ui_builtin_start() to the same position as embedded_mode
remote_ui_wait_for_attach().
- If stdin is redirected, save the original `stdin` and replace fd
0 with tty before calling `ui_builtin_start()`.
Diffstat (limited to 'test')
-rw-r--r-- | test/functional/core/startup_spec.lua | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/functional/core/startup_spec.lua b/test/functional/core/startup_spec.lua index f77af836a6..45bfa93b56 100644 --- a/test/functional/core/startup_spec.lua +++ b/test/functional/core/startup_spec.lua @@ -46,7 +46,7 @@ describe('startup', function() ]]) end) it('in a TTY: has("ttyin")==1 has("ttyout")==1', function() - local screen = Screen.new(25, 3) + local screen = Screen.new(25, 4) screen:attach() if iswin() then command([[set shellcmdflag=/s\ /c shellxquote=\"]]) @@ -58,6 +58,7 @@ describe('startup', function() ..[[, shellescape(v:progpath))]]) screen:expect([[ ^ | + ~ | 1 1 | | ]]) @@ -96,7 +97,7 @@ describe('startup', function() end) end) it('input from pipe (implicit) #7679', function() - local screen = Screen.new(25, 3) + local screen = Screen.new(25, 4) screen:attach() if iswin() then command([[set shellcmdflag=/s\ /c shellxquote=\"]]) @@ -109,6 +110,7 @@ describe('startup', function() ..[[, shellescape(v:progpath))]]) screen:expect([[ ^foo | + ~ | 0 1 | | ]]) |