From fb283cfe4ac5c434fe7381d4e0beaf957b6003cb Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Sun, 9 Jan 2022 14:28:41 +0100 Subject: [PATCH] Move $__fish_initialized to config_interactive This is no longer used in share/config.fish, and it's quite cheesy. The only thing we use it for is defaulting the colorscheme. --- share/config.fish | 5 ----- share/functions/__fish_config_interactive.fish | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/share/config.fish b/share/config.fish index d2de7407c..c0b663065 100644 --- a/share/config.fish +++ b/share/config.fish @@ -8,11 +8,6 @@ set -g IFS \n\ \t set -qg __fish_added_user_paths or set -g __fish_added_user_paths -# For one-off upgrades of the fish version, see __fish_config_interactive.fish -if not set -q __fish_initialized - set -U __fish_initialized 0 -end - # # Create the default command_not_found handler # diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish index f2ac17ec8..0eda18793 100644 --- a/share/functions/__fish_config_interactive.fish +++ b/share/functions/__fish_config_interactive.fish @@ -9,6 +9,11 @@ function __fish_config_interactive -d "Initializations that should be performed return end + # For one-off upgrades of the fish version + if not set -q __fish_initialized + set -U __fish_initialized 0 + end + set -g __fish_config_interactive_done set -g __fish_active_key_bindings