From 9625e9da75dbfd2e1925dabe28ec85583dc712b2 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 18 Jun 2018 18:48:28 +0200 Subject: startup: delete empty stdin buffer if other files were opened DWIM: avoid empty buffer 1 when stdin was empty. If other files were specified at startup, we assume that stdin is only accidentally not-a-TTY: user did not intend to send text from it. ref #8560 ref #8561 --- src/nvim/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/nvim/main.c b/src/nvim/main.c index 9c9be4aa02..6aed84aba5 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -1412,9 +1412,9 @@ static void read_stdin(void) (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 - msg_silent++; - do_buffer(DOBUF_GOTO, DOBUF_FIRST, FORWARD, curbuf->b_next->handle, 0); - msg_silent--; + do_cmdline_cmd("silent! bnext"); + // Delete the empty stdin buffer. + do_cmdline_cmd("bwipeout 1"); } no_wait_return = false; msg_didany = save_msg_didany; -- cgit