aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-07-02 18:08:25 -0400
committerJustin M. Keyes <justinkz@gmail.com>2016-07-02 20:36:31 -0400
commitfab62141c8bd10bc55d857e94e5b686434015d34 (patch)
treee39d53478cfe7e235b49862162abd4b858768eff
parentc5b02d5a7a0a19b338ff2cbf610210058eac0a10 (diff)
downloadrneovim-fab62141c8bd10bc55d857e94e5b686434015d34.tar.gz
rneovim-fab62141c8bd10bc55d857e94e5b686434015d34.tar.bz2
rneovim-fab62141c8bd10bc55d857e94e5b686434015d34.zip
options: Default t_Co to 256.
This commit doesn't change any behavior, only moves the init out of main.c We _could_ move some initialization from tui.c:terminfo_start to an earlier phase, in order to avoid mis-reporting 't_Co' during startup. But this will be messy, and gains very little: TERM=linux works "good enough" as long as we correct t_Co in tui.c:terminfo_start (c5b02d5a7).
-rw-r--r--src/nvim/globals.h2
-rw-r--r--src/nvim/main.c3
-rw-r--r--src/nvim/option.c1
3 files changed, 2 insertions, 4 deletions
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index 42fde50bee..7f91903106 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -414,7 +414,7 @@ EXTERN int provider_call_nesting INIT(= 0);
EXTERN char_u hash_removed;
-EXTERN int t_colors INIT(= 0); /* int value of T_CCO */
+EXTERN int t_colors INIT(= 256); // int value of T_CCO
/*
* When highlight_match is TRUE, highlight a match, starting at the cursor
diff --git a/src/nvim/main.c b/src/nvim/main.c
index a876a0ad21..5cd1dbb467 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -276,7 +276,6 @@ int main(int argc, char **argv)
printf(_("%d files to edit\n"), GARGCOUNT);
full_screen = true;
- t_colors = 256;
check_tty(&params);
/*
@@ -1671,8 +1670,6 @@ static bool do_user_initialization(void)
}
/// Source startup scripts
-///
-/// @param[in]
static void source_startup_scripts(const mparm_T *const parmp)
FUNC_ATTR_NONNULL_ALL
{
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 020a119fd3..a844c4ed80 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -4404,6 +4404,7 @@ bool get_tty_option(char *name, char **value)
if (is_tty_option(name)) {
if (value) {
+ // XXX: All other t_* options were removed in 3baba1e7.
*value = xstrdup("");
}
return true;