Move 24bit setup into config.fish

Fixes #2941.

(cherry picked from commit 8558561650)
This commit is contained in:
Fabian Homborg 2016-04-16 13:00:14 +02:00
parent d7fd0427f3
commit 8d3eae0d76
2 changed files with 18 additions and 17 deletions

View File

@ -17,12 +17,24 @@ function __fish_default_command_not_found_handler
echo "fish: Unknown command '$argv'" >&2
end
#
# Hook up the default as the principal command_not_found handler
# in case we are not interactive
#
status -i; or function __fish_command_not_found_handler --on-event fish_command_not_found
__fish_default_command_not_found_handler $argv
if status --is-interactive
# Enable truecolor/24-bit support for select terminals
if not set -q NVIM_LISTEN_ADDRESS # Neovim will swallow the 24bit sequences, rendering text white
and begin
set -q KONSOLE_PROFILE_NAME # KDE's konsole
or string match -q -- "*:*" $ITERM_SESSION_ID # Supporting versions of iTerm2 will include a colon here
or string match -q -- "st-*" $TERM # suckless' st
or test "$VTE_VERSION" -ge 3600 # Should be all gtk3-vte-based terms after version 3.6.0.0
or test "$COLORTERM" = truecolor -o "$COLORTERM" = 24bit # slang expects this
end
set -g fish_term24bit 1
end
else
# Hook up the default as the principal command_not_found handler
# in case we are not interactive
function __fish_command_not_found_handler --on-event fish_command_not_found
__fish_default_command_not_found_handler $argv
end
end
#

View File

@ -287,15 +287,4 @@ function __fish_config_interactive -d "Initializations that should be performed
fish_fallback_prompt
end
end
if not set -q NVIM_LISTEN_ADDRESS # Neovim will swallow the 24bit sequences, rendering text white
and begin
set -q KONSOLE_PROFILE_NAME # KDE's konsole
or string match -q -- "*:*" $ITERM_SESSION_ID # Supporting versions of iTerm2 will include a colon here
or string match -q -- "st-*" $TERM # suckless' st
or test "$VTE_VERSION" -ge 3600 # Should be all gtk3-vte-based terms after version 3.6.0.0
or test "$COLORTERM" = truecolor -o "$COLORTERM" = 24bit # slang expects this
end
set -g fish_term24bit 1
end
end