kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 03:05:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge #8576 from justinmk/startup-empty-stdin

Browse Source
This commit is contained in:
Justin M. Keyes 2018-06-19 21:04:08 +02:00 committed by GitHub
commit 74d19f685f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/main.c
View File

@ -1410,6 +1410,12 @@ static void read_stdin(void)
int save_msg_didany = msg_didany; int save_msg_didany = msg_didany;
set_buflisted(true); set_buflisted(true);
(void)open_buffer(true, NULL, 0); // create memfile and read file (void)open_buffer(true, NULL, 0); // create memfile and read file
if (BUFEMPTY() && curbuf->b_next != NULL) {
// stdin was empty, go to buffer 2 (e.g. "echo file1 | xargs nvim"). #8561
do_cmdline_cmd("silent! bnext");
// Delete the empty stdin buffer.
do_cmdline_cmd("bwipeout 1");
}
no_wait_return = false; no_wait_return = false;
msg_didany = save_msg_didany; msg_didany = save_msg_didany;
TIME_MSG("reading stdin"); TIME_MSG("reading stdin");

12
test/functional/core/startup_spec.lua
View File

@ -122,6 +122,18 @@ describe('startup', function()
{ 'ohyeah', '' })) { 'ohyeah', '' }))
end) end)
it('if stdin is empty: selects buffer 2, deletes buffer 1 #8561', function()
eq('\r\n 2 %a "file1" line 0\r\n 3 "file2" line 0',
funcs.system({nvim_prog, '-n', '-u', 'NONE', '-i', 'NONE', '--headless',
'+ls!',
'+qall!',
'-',
'file1',
'file2',
},
{ '' }))
end)
it('-e/-E interactive #7679', function() it('-e/-E interactive #7679', function()
clear('-e') clear('-e')
local screen = Screen.new(25, 3) local screen = Screen.new(25, 3)