Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-14 05:53:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Give up earlier when we can't find default key bindings.

Browse source 
This relates to #3302.
This commit is contained in:
Fabian Homborg 2016-08-15 22:36:21 +02:00
parent 386c698d45
commit 790968120d
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
share/functions/__fish_config_interactive.fish
View file

@ -172,11 +172,18 @@ function __fish_config_interactive -d "Initializations that should be performed
if set -q __fish_active_key_bindings if set -q __fish_active_key_bindings
echo "Keeping $__fish_active_key_bindings" >&2 echo "Keeping $__fish_active_key_bindings" >&2
return 1 return 1
else else if functions -q fish_default_key_bindings
echo "Reverting to default bindings" >&2 echo "Reverting to default bindings" >&2
set fish_key_bindings fish_default_key_bindings set fish_key_bindings fish_default_key_bindings
# Return because we are called again # Return because we are called again
return 0 return 0
else
# If we can't even find the default bindings, something is broken.
# Without it, we would eventually run into the stack size limit, but that'd print hundreds of duplicate lines
# so we should give up earlier.
echo "Cannot find fish_default_key_bindings, falling back to very simple bindings." >&2
echo "Most likely something is wrong with your installation." >&2
return 0
end end
end end
set -g __fish_active_key_bindings "$fish_key_bindings" set -g __fish_active_key_bindings "$fish_key_bindings"