Load fish_user_key_bindings for any binding (including vi)

fish_user_key_bindings is the user's, and they should know if they want
vi-ish bindings or emacs-ish (or nano-ish). If they want to define
multiple, they can also do that (e.g. via checking what
$fish_key_bindings is set to).

Fixes #2254

CC @kballard
This commit is contained in:
Fabian Homborg 2015-09-01 11:50:50 +02:00
parent a21e44c155
commit 5f080fcfc9

View file

@ -169,13 +169,13 @@ function __fish_config_interactive -d "Initializations that should be performed
set -g fish_bind_mode default set -g fish_bind_mode default
if test "$fish_key_bindings" = fish_default_key_bindings if test "$fish_key_bindings" = fish_default_key_bindings
fish_default_key_bindings fish_default_key_bindings
# Load user key bindings if they are defined
if functions --query fish_user_key_bindings > /dev/null
fish_user_key_bindings
end
else else
eval $fish_key_bindings ^/dev/null eval $fish_key_bindings ^/dev/null
end end
# Load user key bindings if they are defined
if functions --query fish_user_key_bindings > /dev/null
fish_user_key_bindings
end
end end
# Load key bindings. Redirect stderr per #1155 # Load key bindings. Redirect stderr per #1155