From 91d348abfc0d7ac9b5b19cde0112de8ae4335602 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 29 Jul 2017 20:16:03 +0200 Subject: [PATCH] patch 8.0.0804: running tests fails when stdin is /dev/null 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) --- src/eval.c | 5 +++-- src/evalfunc.c | 5 +++-- src/version.c | 2 ++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/eval.c b/src/eval.c index 4cb32893f..c35def0b2 100644 --- a/src/eval.c +++ b/src/eval.c @@ -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 diff --git a/src/evalfunc.c b/src/evalfunc.c index 422b94e99..7a2e4aad5 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -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) diff --git a/src/version.c b/src/version.c index 86e8cc6d6..0648dd6ec 100644 --- a/src/version.c +++ b/src/version.c @@ -769,6 +769,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 804, /**/ 803, /**/ -- 2.50.1