IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

startup: stdin-text with file args

Browse Source
This commit is contained in:
Justin M. Keyes 2018-05-23 10:54:09 +02:00
parent 51e817dc1b
commit 905d4d78fc
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/nvim/main.c
View File

@ -723,6 +723,17 @@ static void init_locale(void)
} }
#endif #endif
/// Decides whether text (as opposed to commands) will be read from stdin.
/// @see EDIT_STDIN
static bool edit_stdin(mparm_T *parmp)
{
return !headless_mode
&& !embedded_mode
&& !exmode_active // `-es` was not given.
&& !parmp->input_isatty
&& scriptin[0] == NULL; // `-s -` was not given.
}
/// Scan the command line arguments. /// Scan the command line arguments.
static void command_line_scan(mparm_T *parmp) static void command_line_scan(mparm_T *parmp)
{ {
@ -1180,13 +1191,13 @@ scripterror:
path_fix_case(p); path_fix_case(p);
#endif #endif
alist_add(&global_alist, p, int alist_fnum_flag = edit_stdin(parmp)
? 1 // add buffer nr after exp.
: 2; // add buffer number now and use curbuf
#if !defined(UNIX) #if !defined(UNIX)
parmp->literal ? 2 : 0 // add buffer nr after exp. alist_fnum_flag = parmp->literal ? alist_fnum_flag : 0;
#else
2 // add buffer number now and use curbuf
#endif #endif
); alist_add(&global_alist, p, alist_fnum_flag);
} }
// If there are no more letters after the current "-", go to next argument. // If there are no more letters after the current "-", go to next argument.
@ -1208,17 +1219,8 @@ scripterror:
} }
// Handle "foo | nvim". #6299 // Handle "foo | nvim". #6299
if (!headless_mode if (edit_stdin(parmp)) {
&& !embedded_mode parmp->edit_type = EDIT_STDIN;
&& !parmp->input_isatty
&& !exmode_active // `-es` was not given.
&& scriptin[0] == NULL // `-s -` was not given.
) {
if (parmp->edit_type == EDIT_NONE) {
parmp->edit_type = EDIT_STDIN;
} else if (parmp->edit_type != EDIT_STDIN) {
mainerr(err_too_many_args, "stdin");
}
} }
TIME_MSG("parsing arguments"); TIME_MSG("parsing arguments");