thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.0804: running tests fails when stdin is /dev/null

Browse Source 
Problem:    Running tests fails when stdin is /dev/null. (James McCoy)
Solution:   Do not bail out from getting input if the --not-a-term argument
            was given. (closes #1460)
This commit is contained in:
Bram Moolenaar
2017-07-29 20:16:03 +02:00
parent c6df10e5d3
commit 91d348abfc
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/eval.c
View File

@@ -8070,8 +8070,9 @@ get_user_input(
rettv->vval.v_string = NULL;
#ifdef NO_CONSOLE_INPUT
/* While starting up, there is no place to enter text. */
if (no_console_input())
/* While starting up, there is no place to enter text. When running tests
* with --not-a-term we assume feedkeys() will be used. */
if (no_console_input() && !is_not_a_term())
return;
#endif

5
src/evalfunc.c
View File

@@ -6482,8 +6482,9 @@ f_inputlist(typval_T *argvars, typval_T *rettv)
int mouse_used;
#ifdef NO_CONSOLE_INPUT
/* While starting up, there is no place to enter text. */
if (no_console_input())
/* While starting up, there is no place to enter text. When running tests
* with --not-a-term we assume feedkeys() will be used. */
if (no_console_input() && !is_not_a_term())
return;
#endif
if (argvars[0].v_type != VAR_LIST || argvars[0].vval.v_list == NULL)

2
src/version.c
View File

@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
804,
/**/
803,
/**/