From 0f3b4d2bd8e28281c876226b4e9c5e8f02c62872 Mon Sep 17 00:00:00 2001 From: David Adam Date: Sun, 26 Jun 2016 16:23:26 +0800 Subject: [PATCH] Rewrite error messages for incorrect TERM --- src/input.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/input.cpp b/src/input.cpp index 145e10e88..2155e485e 100644 --- a/src/input.cpp +++ b/src/input.cpp @@ -343,21 +343,22 @@ int input_init() { int err_ret; if (setupterm(NULL, STDOUT_FILENO, &err_ret) == ERR) { + debug(0, _(L"Could not set up terminal")); env_var_t term = env_get_string(L"TERM"); if (term.missing_or_empty()) { - debug(0, _(L"Your TERM is unset or empty.")); + debug(0, _(L"TERM environment variable not set")); } else { - debug(0, _(L"Your TERM value of '%ls' is not valid"), term.c_str()); - debug(0, _(L"Check that your terminal type is supported on this system")); + debug(0, _(L"TERM environment variable set to '%ls'"), term.c_str()); + debug(0, _(L"Check that this terminal type is supported on this system")); } env_set(L"TERM", DEFAULT_TERM, ENV_GLOBAL | ENV_EXPORT); if (setupterm(NULL, STDOUT_FILENO, &err_ret) == ERR) { - debug(0, _(L"Unable to setup terminal using your TERM or the '%ls' fallback"), + debug(0, _(L"Could not set up terminal using the fallback terminal type '%ls' - exiting"), DEFAULT_TERM); exit_without_destructors(1); } else { - debug(0, _(L"Using fallback terminal type '%ls' instead"), DEFAULT_TERM); + debug(0, _(L"Using fallback terminal type '%ls'"), DEFAULT_TERM); } }