aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2018-12-30 14:05:17 +0100
committerJustin M. Keyes <justinkz@gmail.com>2018-12-30 19:57:50 +0100
commit9ca836f893ba529728b549b1b922909f8696e3b2 (patch)
treede4f3e5727b7078d0e27d939bfd0c96c7f3289f6 /src
parent31a508cf6c8e66d73a6ce09da60195fc99a45fd6 (diff)
downloadrneovim-9ca836f893ba529728b549b1b922909f8696e3b2.tar.gz
rneovim-9ca836f893ba529728b549b1b922909f8696e3b2.tar.bz2
rneovim-9ca836f893ba529728b549b1b922909f8696e3b2.zip
cleanup: Remove os_term_is_nice()
Diffstat (limited to 'src')
-rw-r--r--src/nvim/option.c7
-rw-r--r--src/nvim/os/env.c25
2 files changed, 0 insertions, 32 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 11f3df7cfa..8c692f9f42 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -955,13 +955,6 @@ void set_init_2(bool headless)
p_window = Rows - 1;
}
set_number_default("window", Rows - 1);
-#if 0
- // This bodges around problems that should be fixed in the TUI layer.
- if (!headless && !os_term_is_nice()) {
- set_string_option_direct((char_u *)"guicursor", -1, (char_u *)"",
- OPT_GLOBAL, SID_NONE);
- }
-#endif
parse_shape_opt(SHAPE_CURSOR); // set cursor shapes from 'guicursor'
(void)parse_printoptions(); // parse 'printoptions' default value
}
diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c
index 2f90d0bc9e..fe01787f9e 100644
--- a/src/nvim/os/env.c
+++ b/src/nvim/os/env.c
@@ -945,31 +945,6 @@ bool os_setenv_append_path(const char *fname)
return false;
}
-/// Returns true if the terminal can be assumed to silently ignore unknown
-/// control codes.
-bool os_term_is_nice(void)
-{
-#if defined(__APPLE__) || defined(WIN32)
- return true;
-#else
- const char *vte_version = os_getenv("VTE_VERSION");
- if ((vte_version && atoi(vte_version) >= 3900)
- || os_getenv("KONSOLE_PROFILE_NAME")
- || os_getenv("KONSOLE_DBUS_SESSION")) {
- return true;
- }
- const char *termprg = os_getenv("TERM_PROGRAM");
- if (termprg && striequal(termprg, "iTerm.app")) {
- return true;
- }
- const char *term = os_getenv("TERM");
- if (term && strncmp(term, "rxvt", 4) == 0) {
- return true;
- }
- return false;
-#endif
-}
-
/// Returns true if `sh` looks like it resolves to "cmd.exe".
bool os_shell_is_cmdexe(const char *sh)
FUNC_ATTR_NONNULL_ALL