diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-07-29 20:16:03 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-07-29 20:16:03 +0200 |
| commit | 91d348abfc0d7ac9b5b19cde0112de8ae4335602 (patch) | |
| tree | 244fb1e710724921fcb6b70b177066d46520f746 | |
| parent | c6df10e5d33ffab2c392626e285317ea8241ebff (diff) | |
patch 8.0.0804: running tests fails when stdin is /dev/nullv8.0.0804
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)
| -rw-r--r-- | src/eval.c | 5 | ||||
| -rw-r--r-- | src/evalfunc.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/eval.c b/src/eval.c index 4cb32893f1..c35def0b27 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 422b94e995..7a2e4aad59 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 86e8cc6d68..0648dd6ec7 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 804, +/**/ 803, /**/ 802, |