pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not advertise 24 bit color support unchecked (#1900)

Browse source 
* 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
This commit is contained in:
raphCode 2022-11-08 13:33:35 +01:00 • committed by GitHub
parent 453142775c
commit 0477d93444
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -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: 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) * 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) * 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: 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) * 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) * Terminal compatibility: send focus in/out events to terminal panes (https://github.com/zellij-org/zellij/pull/1908)

2
zellij-client/src/lib.rs
View file

@ -165,13 +165,11 @@ pub fn start_client(
let first_msg = match info { let first_msg = match info {
ClientInfo::Attach(name, config_options) => { ClientInfo::Attach(name, config_options) => {
envs::set_session_name(name); envs::set_session_name(name);
envs::set_initial_environment_vars();
ClientToServerMsg::AttachClient(client_attributes, config_options) ClientToServerMsg::AttachClient(client_attributes, config_options)
}, },
ClientInfo::New(name) => { ClientInfo::New(name) => {
envs::set_session_name(name); envs::set_session_name(name);
envs::set_initial_environment_vars();
spawn_server(&*ZELLIJ_IPC_PIPE, opts.debug).unwrap(); spawn_server(&*ZELLIJ_IPC_PIPE, opts.debug).unwrap();

4
zellij-utils/src/envs.rs
View file

@ -26,10 +26,6 @@ pub fn set_session_name(v: String) {
set_var(SESSION_NAME_ENV_KEY, v); 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 const SOCKET_DIR_ENV_KEY: &str = "ZELLIJ_SOCKET_DIR";
pub fn get_socket_dir() -> Result<String> { pub fn get_socket_dir() -> Result<String> {
Ok(var(SOCKET_DIR_ENV_KEY)?) Ok(var(SOCKET_DIR_ENV_KEY)?)