From 0477d93444c1cddd167a6e9479c2574d78528758 Mon Sep 17 00:00:00 2001 From: raphCode <15750438+raphCode@users.noreply.github.com> Date: Tue, 8 Nov 2022 13:33:35 +0100 Subject: [PATCH] Do not advertise 24 bit color support unchecked (#1900) * Fix bat syntax colors when using mosh Original reason for this line according to Aram: I set this variable as part of the Sixel support to get notcurses to work properly. I tried communicating with the notcurses maintainers about a workaround for this, but to no avail. * Changelog * Improve changelog message * Remove empty function --- CHANGELOG.md | 1 + zellij-client/src/lib.rs | 2 -- zellij-utils/src/envs.rs | 4 ---- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bed8647c76..478efcd0b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) * fix: properly convert the backslash key from old YAML config files (https://github.com/zellij-org/zellij/pull/1879) * fix: clear floating panes indication when closing a floating command pane (https://github.com/zellij-org/zellij/pull/1897) * Terminal compatibility: do not reset bold when resetting DIM (https://github.com/zellij-org/zellij/pull/1803) +* fix: Do not advertise 24 bit color support unchecked (https://github.com/zellij-org/zellij/pull/1900) * fix: treat CWD properly when opening your editor through `zellij edit` or `ze` (https://github.com/zellij-org/zellij/pull/1904) * fix: allow cli actions to be run outside of a tty environment (https://github.com/zellij-org/zellij/pull/1905) * Terminal compatibility: send focus in/out events to terminal panes (https://github.com/zellij-org/zellij/pull/1908) diff --git a/zellij-client/src/lib.rs b/zellij-client/src/lib.rs index bc9355ceb9..0fd549ab41 100644 --- a/zellij-client/src/lib.rs +++ b/zellij-client/src/lib.rs @@ -165,13 +165,11 @@ pub fn start_client( let first_msg = match info { ClientInfo::Attach(name, config_options) => { envs::set_session_name(name); - envs::set_initial_environment_vars(); ClientToServerMsg::AttachClient(client_attributes, config_options) }, ClientInfo::New(name) => { envs::set_session_name(name); - envs::set_initial_environment_vars(); spawn_server(&*ZELLIJ_IPC_PIPE, opts.debug).unwrap(); diff --git a/zellij-utils/src/envs.rs b/zellij-utils/src/envs.rs index 3596e94e19..c7aff980a6 100644 --- a/zellij-utils/src/envs.rs +++ b/zellij-utils/src/envs.rs @@ -26,10 +26,6 @@ pub fn set_session_name(v: String) { set_var(SESSION_NAME_ENV_KEY, v); } -pub fn set_initial_environment_vars() { - set_var("COLORTERM", "24bit"); -} - pub const SOCKET_DIR_ENV_KEY: &str = "ZELLIJ_SOCKET_DIR"; pub fn get_socket_dir() -> Result { Ok(var(SOCKET_DIR_ENV_KEY)?)