Skip to content

Commit

Permalink
Do not advertise 24 bit color support unchecked (zellij-org#1900)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
raphCode authored Nov 8, 2022
1 parent 4531427 commit 0477d93
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions zellij-client/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
4 changes: 0 additions & 4 deletions zellij-utils/src/envs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> {
Ok(var(SOCKET_DIR_ENV_KEY)?)
Expand Down

0 comments on commit 0477d93

Please sign in to comment.