From 8558561650995b330a1ae5ee87c592382856cc40 Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Sat, 16 Apr 2016 13:00:14 +0200 Subject: [PATCH] Move 24bit setup into config.fish Fixes #2941. --- share/config.fish | 24 ++++++++++++++----- .../functions/__fish_config_interactive.fish | 11 --------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/share/config.fish b/share/config.fish index 86e8d9b7d..fa1a26282 100644 --- a/share/config.fish +++ b/share/config.fish @@ -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 # diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish index 3702c075d..bca410ac5 100644 --- a/share/functions/__fish_config_interactive.fish +++ b/share/functions/__fish_config_interactive.fish @@ -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